6 #include "object-store.h"
12 #include "string-list.h"
13 #include "mergesort.h"
14 #include "argv-array.h"
16 enum map_direction
{ FROM_SRC
, FROM_DST
};
18 struct counted_string
{
25 struct counted_string
*instead_of
;
30 struct rewrite
**rewrite
;
35 static struct remote
**remotes
;
36 static int remotes_alloc
;
37 static int remotes_nr
;
38 static struct hashmap remotes_hash
;
40 static struct branch
**branches
;
41 static int branches_alloc
;
42 static int branches_nr
;
44 static struct branch
*current_branch
;
45 static const char *pushremote_name
;
47 static struct rewrites rewrites
;
48 static struct rewrites rewrites_push
;
50 static int valid_remote(const struct remote
*remote
)
52 return (!!remote
->url
) || (!!remote
->foreign_vcs
);
55 static const char *alias_url(const char *url
, struct rewrites
*r
)
58 struct counted_string
*longest
;
63 for (i
= 0; i
< r
->rewrite_nr
; i
++) {
66 for (j
= 0; j
< r
->rewrite
[i
]->instead_of_nr
; j
++) {
67 if (starts_with(url
, r
->rewrite
[i
]->instead_of
[j
].s
) &&
69 longest
->len
< r
->rewrite
[i
]->instead_of
[j
].len
)) {
70 longest
= &(r
->rewrite
[i
]->instead_of
[j
]);
78 return xstrfmt("%s%s", r
->rewrite
[longest_i
]->base
, url
+ longest
->len
);
81 static void add_url(struct remote
*remote
, const char *url
)
83 ALLOC_GROW(remote
->url
, remote
->url_nr
+ 1, remote
->url_alloc
);
84 remote
->url
[remote
->url_nr
++] = url
;
87 static void add_pushurl(struct remote
*remote
, const char *pushurl
)
89 ALLOC_GROW(remote
->pushurl
, remote
->pushurl_nr
+ 1, remote
->pushurl_alloc
);
90 remote
->pushurl
[remote
->pushurl_nr
++] = pushurl
;
93 static void add_pushurl_alias(struct remote
*remote
, const char *url
)
95 const char *pushurl
= alias_url(url
, &rewrites_push
);
97 add_pushurl(remote
, pushurl
);
100 static void add_url_alias(struct remote
*remote
, const char *url
)
102 add_url(remote
, alias_url(url
, &rewrites
));
103 add_pushurl_alias(remote
, url
);
106 struct remotes_hash_key
{
111 static int remotes_hash_cmp(const void *unused_cmp_data
,
113 const void *entry_or_key
,
116 const struct remote
*a
= entry
;
117 const struct remote
*b
= entry_or_key
;
118 const struct remotes_hash_key
*key
= keydata
;
121 return strncmp(a
->name
, key
->str
, key
->len
) || a
->name
[key
->len
];
123 return strcmp(a
->name
, b
->name
);
126 static inline void init_remotes_hash(void)
128 if (!remotes_hash
.cmpfn
)
129 hashmap_init(&remotes_hash
, remotes_hash_cmp
, NULL
, 0);
132 static struct remote
*make_remote(const char *name
, int len
)
134 struct remote
*ret
, *replaced
;
135 struct remotes_hash_key lookup
;
136 struct hashmap_entry lookup_entry
;
144 hashmap_entry_init(&lookup_entry
, memhash(name
, len
));
146 if ((ret
= hashmap_get(&remotes_hash
, &lookup_entry
, &lookup
)) != NULL
)
149 ret
= xcalloc(1, sizeof(struct remote
));
150 ret
->prune
= -1; /* unspecified */
151 ret
->prune_tags
= -1; /* unspecified */
152 ret
->name
= xstrndup(name
, len
);
153 refspec_init(&ret
->push
, REFSPEC_PUSH
);
154 refspec_init(&ret
->fetch
, REFSPEC_FETCH
);
156 ALLOC_GROW(remotes
, remotes_nr
+ 1, remotes_alloc
);
157 remotes
[remotes_nr
++] = ret
;
159 hashmap_entry_init(ret
, lookup_entry
.hash
);
160 replaced
= hashmap_put(&remotes_hash
, ret
);
161 assert(replaced
== NULL
); /* no previous entry overwritten */
165 static void add_merge(struct branch
*branch
, const char *name
)
167 ALLOC_GROW(branch
->merge_name
, branch
->merge_nr
+ 1,
168 branch
->merge_alloc
);
169 branch
->merge_name
[branch
->merge_nr
++] = name
;
172 static struct branch
*make_branch(const char *name
, int len
)
177 for (i
= 0; i
< branches_nr
; i
++) {
178 if (len
? (!strncmp(name
, branches
[i
]->name
, len
) &&
179 !branches
[i
]->name
[len
]) :
180 !strcmp(name
, branches
[i
]->name
))
184 ALLOC_GROW(branches
, branches_nr
+ 1, branches_alloc
);
185 ret
= xcalloc(1, sizeof(struct branch
));
186 branches
[branches_nr
++] = ret
;
188 ret
->name
= xstrndup(name
, len
);
190 ret
->name
= xstrdup(name
);
191 ret
->refname
= xstrfmt("refs/heads/%s", ret
->name
);
196 static struct rewrite
*make_rewrite(struct rewrites
*r
, const char *base
, int len
)
201 for (i
= 0; i
< r
->rewrite_nr
; i
++) {
203 ? (len
== r
->rewrite
[i
]->baselen
&&
204 !strncmp(base
, r
->rewrite
[i
]->base
, len
))
205 : !strcmp(base
, r
->rewrite
[i
]->base
))
206 return r
->rewrite
[i
];
209 ALLOC_GROW(r
->rewrite
, r
->rewrite_nr
+ 1, r
->rewrite_alloc
);
210 ret
= xcalloc(1, sizeof(struct rewrite
));
211 r
->rewrite
[r
->rewrite_nr
++] = ret
;
213 ret
->base
= xstrndup(base
, len
);
217 ret
->base
= xstrdup(base
);
218 ret
->baselen
= strlen(base
);
223 static void add_instead_of(struct rewrite
*rewrite
, const char *instead_of
)
225 ALLOC_GROW(rewrite
->instead_of
, rewrite
->instead_of_nr
+ 1, rewrite
->instead_of_alloc
);
226 rewrite
->instead_of
[rewrite
->instead_of_nr
].s
= instead_of
;
227 rewrite
->instead_of
[rewrite
->instead_of_nr
].len
= strlen(instead_of
);
228 rewrite
->instead_of_nr
++;
231 static const char *skip_spaces(const char *s
)
238 static void read_remotes_file(struct remote
*remote
)
240 struct strbuf buf
= STRBUF_INIT
;
241 FILE *f
= fopen_or_warn(git_path("remotes/%s", remote
->name
), "r");
245 remote
->configured_in_repo
= 1;
246 remote
->origin
= REMOTE_REMOTES
;
247 while (strbuf_getline(&buf
, f
) != EOF
) {
252 if (skip_prefix(buf
.buf
, "URL:", &v
))
253 add_url_alias(remote
, xstrdup(skip_spaces(v
)));
254 else if (skip_prefix(buf
.buf
, "Push:", &v
))
255 refspec_append(&remote
->push
, skip_spaces(v
));
256 else if (skip_prefix(buf
.buf
, "Pull:", &v
))
257 refspec_append(&remote
->fetch
, skip_spaces(v
));
259 strbuf_release(&buf
);
263 static void read_branches_file(struct remote
*remote
)
266 struct strbuf buf
= STRBUF_INIT
;
267 FILE *f
= fopen_or_warn(git_path("branches/%s", remote
->name
), "r");
272 strbuf_getline_lf(&buf
, f
);
276 strbuf_release(&buf
);
280 remote
->configured_in_repo
= 1;
281 remote
->origin
= REMOTE_BRANCHES
;
284 * The branches file would have URL and optionally
285 * #branch specified. The "master" (or specified) branch is
286 * fetched and stored in the local branch matching the
289 frag
= strchr(buf
.buf
, '#');
295 add_url_alias(remote
, strbuf_detach(&buf
, NULL
));
296 strbuf_addf(&buf
, "refs/heads/%s:refs/heads/%s",
298 refspec_append(&remote
->fetch
, buf
.buf
);
301 * Cogito compatible push: push current HEAD to remote #branch
302 * (master if missing)
305 strbuf_addf(&buf
, "HEAD:refs/heads/%s", frag
);
306 refspec_append(&remote
->push
, buf
.buf
);
307 remote
->fetch_tags
= 1; /* always auto-follow */
308 strbuf_release(&buf
);
311 static int handle_config(const char *key
, const char *value
, void *cb
)
316 struct remote
*remote
;
317 struct branch
*branch
;
318 if (parse_config_key(key
, "branch", &name
, &namelen
, &subkey
) >= 0) {
321 branch
= make_branch(name
, namelen
);
322 if (!strcmp(subkey
, "remote")) {
323 return git_config_string(&branch
->remote_name
, key
, value
);
324 } else if (!strcmp(subkey
, "pushremote")) {
325 return git_config_string(&branch
->pushremote_name
, key
, value
);
326 } else if (!strcmp(subkey
, "merge")) {
328 return config_error_nonbool(key
);
329 add_merge(branch
, xstrdup(value
));
333 if (parse_config_key(key
, "url", &name
, &namelen
, &subkey
) >= 0) {
334 struct rewrite
*rewrite
;
337 if (!strcmp(subkey
, "insteadof")) {
338 rewrite
= make_rewrite(&rewrites
, name
, namelen
);
340 return config_error_nonbool(key
);
341 add_instead_of(rewrite
, xstrdup(value
));
342 } else if (!strcmp(subkey
, "pushinsteadof")) {
343 rewrite
= make_rewrite(&rewrites_push
, name
, namelen
);
345 return config_error_nonbool(key
);
346 add_instead_of(rewrite
, xstrdup(value
));
350 if (parse_config_key(key
, "remote", &name
, &namelen
, &subkey
) < 0)
353 /* Handle remote.* variables */
354 if (!name
&& !strcmp(subkey
, "pushdefault"))
355 return git_config_string(&pushremote_name
, key
, value
);
359 /* Handle remote.<name>.* variables */
361 warning("Config remote shorthand cannot begin with '/': %s",
365 remote
= make_remote(name
, namelen
);
366 remote
->origin
= REMOTE_CONFIG
;
367 if (current_config_scope() == CONFIG_SCOPE_REPO
)
368 remote
->configured_in_repo
= 1;
369 if (!strcmp(subkey
, "mirror"))
370 remote
->mirror
= git_config_bool(key
, value
);
371 else if (!strcmp(subkey
, "skipdefaultupdate"))
372 remote
->skip_default_update
= git_config_bool(key
, value
);
373 else if (!strcmp(subkey
, "skipfetchall"))
374 remote
->skip_default_update
= git_config_bool(key
, value
);
375 else if (!strcmp(subkey
, "prune"))
376 remote
->prune
= git_config_bool(key
, value
);
377 else if (!strcmp(subkey
, "prunetags"))
378 remote
->prune_tags
= git_config_bool(key
, value
);
379 else if (!strcmp(subkey
, "url")) {
381 if (git_config_string(&v
, key
, value
))
384 } else if (!strcmp(subkey
, "pushurl")) {
386 if (git_config_string(&v
, key
, value
))
388 add_pushurl(remote
, v
);
389 } else if (!strcmp(subkey
, "push")) {
391 if (git_config_string(&v
, key
, value
))
393 refspec_append(&remote
->push
, v
);
395 } else if (!strcmp(subkey
, "fetch")) {
397 if (git_config_string(&v
, key
, value
))
399 refspec_append(&remote
->fetch
, v
);
401 } else if (!strcmp(subkey
, "receivepack")) {
403 if (git_config_string(&v
, key
, value
))
405 if (!remote
->receivepack
)
406 remote
->receivepack
= v
;
408 error("more than one receivepack given, using the first");
409 } else if (!strcmp(subkey
, "uploadpack")) {
411 if (git_config_string(&v
, key
, value
))
413 if (!remote
->uploadpack
)
414 remote
->uploadpack
= v
;
416 error("more than one uploadpack given, using the first");
417 } else if (!strcmp(subkey
, "tagopt")) {
418 if (!strcmp(value
, "--no-tags"))
419 remote
->fetch_tags
= -1;
420 else if (!strcmp(value
, "--tags"))
421 remote
->fetch_tags
= 2;
422 } else if (!strcmp(subkey
, "proxy")) {
423 return git_config_string((const char **)&remote
->http_proxy
,
425 } else if (!strcmp(subkey
, "proxyauthmethod")) {
426 return git_config_string((const char **)&remote
->http_proxy_authmethod
,
428 } else if (!strcmp(subkey
, "vcs")) {
429 return git_config_string(&remote
->foreign_vcs
, key
, value
);
434 static void alias_all_urls(void)
437 for (i
= 0; i
< remotes_nr
; i
++) {
438 int add_pushurl_aliases
;
441 for (j
= 0; j
< remotes
[i
]->pushurl_nr
; j
++) {
442 remotes
[i
]->pushurl
[j
] = alias_url(remotes
[i
]->pushurl
[j
], &rewrites
);
444 add_pushurl_aliases
= remotes
[i
]->pushurl_nr
== 0;
445 for (j
= 0; j
< remotes
[i
]->url_nr
; j
++) {
446 if (add_pushurl_aliases
)
447 add_pushurl_alias(remotes
[i
], remotes
[i
]->url
[j
]);
448 remotes
[i
]->url
[j
] = alias_url(remotes
[i
]->url
[j
], &rewrites
);
453 static void read_config(void)
462 current_branch
= NULL
;
463 if (startup_info
->have_repository
) {
464 const char *head_ref
= resolve_ref_unsafe("HEAD", 0, NULL
, &flag
);
465 if (head_ref
&& (flag
& REF_ISSYMREF
) &&
466 skip_prefix(head_ref
, "refs/heads/", &head_ref
)) {
467 current_branch
= make_branch(head_ref
, 0);
470 git_config(handle_config
, NULL
);
474 static int valid_remote_nick(const char *name
)
476 if (!name
[0] || is_dot_or_dotdot(name
))
479 /* remote nicknames cannot contain slashes */
481 if (is_dir_sep(*name
++))
486 const char *remote_for_branch(struct branch
*branch
, int *explicit)
488 if (branch
&& branch
->remote_name
) {
491 return branch
->remote_name
;
498 const char *pushremote_for_branch(struct branch
*branch
, int *explicit)
500 if (branch
&& branch
->pushremote_name
) {
503 return branch
->pushremote_name
;
505 if (pushremote_name
) {
508 return pushremote_name
;
510 return remote_for_branch(branch
, explicit);
513 const char *remote_ref_for_branch(struct branch
*branch
, int for_push
,
518 if (branch
->merge_nr
) {
521 return branch
->merge_name
[0];
524 const char *dst
, *remote_name
=
525 pushremote_for_branch(branch
, NULL
);
526 struct remote
*remote
= remote_get(remote_name
);
528 if (remote
&& remote
->push
.nr
&&
529 (dst
= apply_refspecs(&remote
->push
,
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
*rs
,
702 struct refspec_item
*query
,
703 struct string_list
*results
)
706 int find_src
= !query
->src
;
708 if (find_src
&& !query
->dst
)
709 error("query_refspecs_multiple: need either src or dst");
711 for (i
= 0; i
< rs
->nr
; i
++) {
712 struct refspec_item
*refspec
= &rs
->items
[i
];
713 const char *key
= find_src
? refspec
->dst
: refspec
->src
;
714 const char *value
= find_src
? refspec
->src
: refspec
->dst
;
715 const char *needle
= find_src
? query
->dst
: query
->src
;
716 char **result
= find_src
? &query
->src
: &query
->dst
;
720 if (refspec
->pattern
) {
721 if (match_name_with_pattern(key
, needle
, value
, result
))
722 string_list_append_nodup(results
, *result
);
723 } else if (!strcmp(needle
, key
)) {
724 string_list_append(results
, value
);
729 int query_refspecs(struct refspec
*rs
, struct refspec_item
*query
)
732 int find_src
= !query
->src
;
733 const char *needle
= find_src
? query
->dst
: query
->src
;
734 char **result
= find_src
? &query
->src
: &query
->dst
;
736 if (find_src
&& !query
->dst
)
737 return error("query_refspecs: need either src or dst");
739 for (i
= 0; i
< rs
->nr
; i
++) {
740 struct refspec_item
*refspec
= &rs
->items
[i
];
741 const char *key
= find_src
? refspec
->dst
: refspec
->src
;
742 const char *value
= find_src
? refspec
->src
: refspec
->dst
;
746 if (refspec
->pattern
) {
747 if (match_name_with_pattern(key
, needle
, value
, result
)) {
748 query
->force
= refspec
->force
;
751 } else if (!strcmp(needle
, key
)) {
752 *result
= xstrdup(value
);
753 query
->force
= refspec
->force
;
760 char *apply_refspecs(struct refspec
*rs
, const char *name
)
762 struct refspec_item query
;
764 memset(&query
, 0, sizeof(struct refspec_item
));
765 query
.src
= (char *)name
;
767 if (query_refspecs(rs
, &query
))
773 int remote_find_tracking(struct remote
*remote
, struct refspec_item
*refspec
)
775 return query_refspecs(&remote
->fetch
, refspec
);
778 static struct ref
*alloc_ref_with_prefix(const char *prefix
, size_t prefixlen
,
781 size_t len
= strlen(name
);
782 struct ref
*ref
= xcalloc(1, st_add4(sizeof(*ref
), prefixlen
, len
, 1));
783 memcpy(ref
->name
, prefix
, prefixlen
);
784 memcpy(ref
->name
+ prefixlen
, name
, len
);
788 struct ref
*alloc_ref(const char *name
)
790 return alloc_ref_with_prefix("", 0, name
);
793 struct ref
*copy_ref(const struct ref
*ref
)
799 len
= st_add3(sizeof(struct ref
), strlen(ref
->name
), 1);
801 memcpy(cpy
, ref
, len
);
803 cpy
->symref
= xstrdup_or_null(ref
->symref
);
804 cpy
->remote_status
= xstrdup_or_null(ref
->remote_status
);
805 cpy
->peer_ref
= copy_ref(ref
->peer_ref
);
809 struct ref
*copy_ref_list(const struct ref
*ref
)
811 struct ref
*ret
= NULL
;
812 struct ref
**tail
= &ret
;
814 *tail
= copy_ref(ref
);
816 tail
= &((*tail
)->next
);
821 static void free_ref(struct ref
*ref
)
825 free_ref(ref
->peer_ref
);
826 free(ref
->remote_status
);
831 void free_refs(struct ref
*ref
)
841 int ref_compare_name(const void *va
, const void *vb
)
843 const struct ref
*a
= va
, *b
= vb
;
844 return strcmp(a
->name
, b
->name
);
847 static void *ref_list_get_next(const void *a
)
849 return ((const struct ref
*)a
)->next
;
852 static void ref_list_set_next(void *a
, void *next
)
854 ((struct ref
*)a
)->next
= next
;
857 void sort_ref_list(struct ref
**l
, int (*cmp
)(const void *, const void *))
859 *l
= llist_mergesort(*l
, ref_list_get_next
, ref_list_set_next
, cmp
);
862 int count_refspec_match(const char *pattern
,
864 struct ref
**matched_ref
)
866 int patlen
= strlen(pattern
);
867 struct ref
*matched_weak
= NULL
;
868 struct ref
*matched
= NULL
;
872 for (weak_match
= match
= 0; refs
; refs
= refs
->next
) {
873 char *name
= refs
->name
;
874 int namelen
= strlen(name
);
876 if (!refname_match(pattern
, name
))
879 /* A match is "weak" if it is with refs outside
880 * heads or tags, and did not specify the pattern
881 * in full (e.g. "refs/remotes/origin/master") or at
882 * least from the toplevel (e.g. "remotes/origin/master");
883 * otherwise "git push $URL master" would result in
884 * ambiguity between remotes/origin/master and heads/master
885 * at the remote site.
887 if (namelen
!= patlen
&&
888 patlen
!= namelen
- 5 &&
889 !starts_with(name
, "refs/heads/") &&
890 !starts_with(name
, "refs/tags/")) {
891 /* We want to catch the case where only weak
892 * matches are found and there are multiple
893 * matches, and where more than one strong
894 * matches are found, as ambiguous. One
895 * strong match with zero or more weak matches
896 * are acceptable as a unique match.
908 *matched_ref
= matched_weak
;
913 *matched_ref
= matched
;
918 static void tail_link_ref(struct ref
*ref
, struct ref
***tail
)
926 static struct ref
*alloc_delete_ref(void)
928 struct ref
*ref
= alloc_ref("(delete)");
929 oidclr(&ref
->new_oid
);
933 static int try_explicit_object_name(const char *name
,
936 struct object_id oid
;
940 *match
= alloc_delete_ref();
944 if (get_oid(name
, &oid
))
948 *match
= alloc_ref(name
);
949 oidcpy(&(*match
)->new_oid
, &oid
);
954 static struct ref
*make_linked_ref(const char *name
, struct ref
***tail
)
956 struct ref
*ret
= alloc_ref(name
);
957 tail_link_ref(ret
, tail
);
961 static char *guess_ref(const char *name
, struct ref
*peer
)
963 struct strbuf buf
= STRBUF_INIT
;
965 const char *r
= resolve_ref_unsafe(peer
->name
, RESOLVE_REF_READING
,
970 if (starts_with(r
, "refs/heads/"))
971 strbuf_addstr(&buf
, "refs/heads/");
972 else if (starts_with(r
, "refs/tags/"))
973 strbuf_addstr(&buf
, "refs/tags/");
977 strbuf_addstr(&buf
, name
);
978 return strbuf_detach(&buf
, NULL
);
981 static int match_explicit_lhs(struct ref
*src
,
982 struct refspec_item
*rs
,
984 int *allocated_match
)
986 switch (count_refspec_match(rs
->src
, src
, match
)) {
989 *allocated_match
= 0;
992 /* The source could be in the get_sha1() format
993 * not a reference name. :refs/other is a
994 * way to delete 'other' ref at the remote end.
996 if (try_explicit_object_name(rs
->src
, match
) < 0)
997 return error("src refspec %s does not match any.", rs
->src
);
999 *allocated_match
= 1;
1002 return error("src refspec %s matches more than one.", rs
->src
);
1006 static int match_explicit(struct ref
*src
, struct ref
*dst
,
1007 struct ref
***dst_tail
,
1008 struct refspec_item
*rs
)
1010 struct ref
*matched_src
, *matched_dst
;
1013 const char *dst_value
= rs
->dst
;
1016 if (rs
->pattern
|| rs
->matching
)
1019 matched_src
= matched_dst
= NULL
;
1020 if (match_explicit_lhs(src
, rs
, &matched_src
, &allocated_src
) < 0)
1026 dst_value
= resolve_ref_unsafe(matched_src
->name
,
1027 RESOLVE_REF_READING
,
1030 ((flag
& REF_ISSYMREF
) &&
1031 !starts_with(dst_value
, "refs/heads/")))
1032 die("%s cannot be resolved to branch.",
1036 switch (count_refspec_match(dst_value
, dst
, &matched_dst
)) {
1040 if (starts_with(dst_value
, "refs/"))
1041 matched_dst
= make_linked_ref(dst_value
, dst_tail
);
1042 else if (is_null_oid(&matched_src
->new_oid
))
1043 error("unable to delete '%s': remote ref does not exist",
1045 else if ((dst_guess
= guess_ref(dst_value
, matched_src
))) {
1046 matched_dst
= make_linked_ref(dst_guess
, dst_tail
);
1049 error("unable to push to unqualified destination: %s\n"
1050 "The destination refspec neither matches an "
1051 "existing ref on the remote nor\n"
1052 "begins with refs/, and we are unable to "
1053 "guess a prefix based on the source ref.",
1058 error("dst refspec %s matches more than one.",
1064 if (matched_dst
->peer_ref
)
1065 return error("dst ref %s receives from more than one src.",
1068 matched_dst
->peer_ref
= allocated_src
?
1070 copy_ref(matched_src
);
1071 matched_dst
->force
= rs
->force
;
1076 static int match_explicit_refs(struct ref
*src
, struct ref
*dst
,
1077 struct ref
***dst_tail
, struct refspec
*rs
)
1080 for (i
= errs
= 0; i
< rs
->nr
; i
++)
1081 errs
+= match_explicit(src
, dst
, dst_tail
, &rs
->items
[i
]);
1085 static char *get_ref_match(const struct refspec
*rs
, const struct ref
*ref
,
1086 int send_mirror
, int direction
,
1087 const struct refspec_item
**ret_pat
)
1089 const struct refspec_item
*pat
;
1092 int matching_refs
= -1;
1093 for (i
= 0; i
< rs
->nr
; i
++) {
1094 const struct refspec_item
*item
= &rs
->items
[i
];
1095 if (item
->matching
&&
1096 (matching_refs
== -1 || item
->force
)) {
1101 if (item
->pattern
) {
1102 const char *dst_side
= item
->dst
? item
->dst
: item
->src
;
1104 if (direction
== FROM_SRC
)
1105 match
= match_name_with_pattern(item
->src
, ref
->name
, dst_side
, &name
);
1107 match
= match_name_with_pattern(dst_side
, ref
->name
, item
->src
, &name
);
1114 if (matching_refs
== -1)
1117 pat
= &rs
->items
[matching_refs
];
1118 if (pat
->matching
) {
1120 * "matching refs"; traditionally we pushed everything
1121 * including refs outside refs/heads/ hierarchy, but
1122 * that does not make much sense these days.
1124 if (!send_mirror
&& !starts_with(ref
->name
, "refs/heads/"))
1126 name
= xstrdup(ref
->name
);
1133 static struct ref
**tail_ref(struct ref
**head
)
1135 struct ref
**tail
= head
;
1137 tail
= &((*tail
)->next
);
1142 struct commit
**tip
;
1146 static void add_to_tips(struct tips
*tips
, const struct object_id
*oid
)
1148 struct commit
*commit
;
1150 if (is_null_oid(oid
))
1152 commit
= lookup_commit_reference_gently(oid
, 1);
1153 if (!commit
|| (commit
->object
.flags
& TMP_MARK
))
1155 commit
->object
.flags
|= TMP_MARK
;
1156 ALLOC_GROW(tips
->tip
, tips
->nr
+ 1, tips
->alloc
);
1157 tips
->tip
[tips
->nr
++] = commit
;
1160 static void add_missing_tags(struct ref
*src
, struct ref
**dst
, struct ref
***dst_tail
)
1162 struct string_list dst_tag
= STRING_LIST_INIT_NODUP
;
1163 struct string_list src_tag
= STRING_LIST_INIT_NODUP
;
1164 struct string_list_item
*item
;
1166 struct tips sent_tips
;
1169 * Collect everything we know they would have at the end of
1170 * this push, and collect all tags they have.
1172 memset(&sent_tips
, 0, sizeof(sent_tips
));
1173 for (ref
= *dst
; ref
; ref
= ref
->next
) {
1174 if (ref
->peer_ref
&&
1175 !is_null_oid(&ref
->peer_ref
->new_oid
))
1176 add_to_tips(&sent_tips
, &ref
->peer_ref
->new_oid
);
1178 add_to_tips(&sent_tips
, &ref
->old_oid
);
1179 if (starts_with(ref
->name
, "refs/tags/"))
1180 string_list_append(&dst_tag
, ref
->name
);
1182 clear_commit_marks_many(sent_tips
.nr
, sent_tips
.tip
, TMP_MARK
);
1184 string_list_sort(&dst_tag
);
1186 /* Collect tags they do not have. */
1187 for (ref
= src
; ref
; ref
= ref
->next
) {
1188 if (!starts_with(ref
->name
, "refs/tags/"))
1189 continue; /* not a tag */
1190 if (string_list_has_string(&dst_tag
, ref
->name
))
1191 continue; /* they already have it */
1192 if (oid_object_info(the_repository
, &ref
->new_oid
, NULL
) != OBJ_TAG
)
1193 continue; /* be conservative */
1194 item
= string_list_append(&src_tag
, ref
->name
);
1197 string_list_clear(&dst_tag
, 0);
1200 * At this point, src_tag lists tags that are missing from
1201 * dst, and sent_tips lists the tips we are pushing or those
1202 * that we know they already have. An element in the src_tag
1203 * that is an ancestor of any of the sent_tips needs to be
1204 * sent to the other side.
1207 for_each_string_list_item(item
, &src_tag
) {
1208 struct ref
*ref
= item
->util
;
1209 struct ref
*dst_ref
;
1210 struct commit
*commit
;
1212 if (is_null_oid(&ref
->new_oid
))
1214 commit
= lookup_commit_reference_gently(&ref
->new_oid
,
1217 /* not pushing a commit, which is not an error */
1221 * Is this tag, which they do not have, reachable from
1222 * any of the commits we are sending?
1224 if (!in_merge_bases_many(commit
, sent_tips
.nr
, sent_tips
.tip
))
1228 dst_ref
= make_linked_ref(ref
->name
, dst_tail
);
1229 oidcpy(&dst_ref
->new_oid
, &ref
->new_oid
);
1230 dst_ref
->peer_ref
= copy_ref(ref
);
1233 string_list_clear(&src_tag
, 0);
1234 free(sent_tips
.tip
);
1237 struct ref
*find_ref_by_name(const struct ref
*list
, const char *name
)
1239 for ( ; list
; list
= list
->next
)
1240 if (!strcmp(list
->name
, name
))
1241 return (struct ref
*)list
;
1245 static void prepare_ref_index(struct string_list
*ref_index
, struct ref
*ref
)
1247 for ( ; ref
; ref
= ref
->next
)
1248 string_list_append_nodup(ref_index
, ref
->name
)->util
= ref
;
1250 string_list_sort(ref_index
);
1254 * Given only the set of local refs, sanity-check the set of push
1255 * refspecs. We can't catch all errors that match_push_refs would,
1256 * but we can catch some errors early before even talking to the
1259 int check_push_refs(struct ref
*src
, struct refspec
*rs
)
1264 for (i
= 0; i
< rs
->nr
; i
++) {
1265 struct refspec_item
*item
= &rs
->items
[i
];
1267 if (item
->pattern
|| item
->matching
)
1270 ret
|= match_explicit_lhs(src
, item
, NULL
, NULL
);
1277 * Given the set of refs the local repository has, the set of refs the
1278 * remote repository has, and the refspec used for push, determine
1279 * what remote refs we will update and with what value by setting
1280 * peer_ref (which object is being pushed) and force (if the push is
1281 * forced) in elements of "dst". The function may add new elements to
1282 * dst (e.g. pushing to a new branch, done in match_explicit_refs).
1284 int match_push_refs(struct ref
*src
, struct ref
**dst
,
1285 struct refspec
*rs
, int flags
)
1287 int send_all
= flags
& MATCH_REFS_ALL
;
1288 int send_mirror
= flags
& MATCH_REFS_MIRROR
;
1289 int send_prune
= flags
& MATCH_REFS_PRUNE
;
1291 struct ref
*ref
, **dst_tail
= tail_ref(dst
);
1292 struct string_list dst_ref_index
= STRING_LIST_INIT_NODUP
;
1294 /* If no refspec is provided, use the default ":" */
1296 refspec_append(rs
, ":");
1298 errs
= match_explicit_refs(src
, *dst
, &dst_tail
, rs
);
1300 /* pick the remainder */
1301 for (ref
= src
; ref
; ref
= ref
->next
) {
1302 struct string_list_item
*dst_item
;
1303 struct ref
*dst_peer
;
1304 const struct refspec_item
*pat
= NULL
;
1307 dst_name
= get_ref_match(rs
, ref
, send_mirror
, FROM_SRC
, &pat
);
1311 if (!dst_ref_index
.nr
)
1312 prepare_ref_index(&dst_ref_index
, *dst
);
1314 dst_item
= string_list_lookup(&dst_ref_index
, dst_name
);
1315 dst_peer
= dst_item
? dst_item
->util
: NULL
;
1317 if (dst_peer
->peer_ref
)
1318 /* We're already sending something to this ref. */
1321 if (pat
->matching
&& !(send_all
|| send_mirror
))
1323 * Remote doesn't have it, and we have no
1324 * explicit pattern, and we don't have
1325 * --all or --mirror.
1329 /* Create a new one and link it */
1330 dst_peer
= make_linked_ref(dst_name
, &dst_tail
);
1331 oidcpy(&dst_peer
->new_oid
, &ref
->new_oid
);
1332 string_list_insert(&dst_ref_index
,
1333 dst_peer
->name
)->util
= dst_peer
;
1335 dst_peer
->peer_ref
= copy_ref(ref
);
1336 dst_peer
->force
= pat
->force
;
1341 string_list_clear(&dst_ref_index
, 0);
1343 if (flags
& MATCH_REFS_FOLLOW_TAGS
)
1344 add_missing_tags(src
, dst
, &dst_tail
);
1347 struct string_list src_ref_index
= STRING_LIST_INIT_NODUP
;
1348 /* check for missing refs on the remote */
1349 for (ref
= *dst
; ref
; ref
= ref
->next
) {
1353 /* We're already sending something to this ref. */
1356 src_name
= get_ref_match(rs
, ref
, send_mirror
, FROM_DST
, NULL
);
1358 if (!src_ref_index
.nr
)
1359 prepare_ref_index(&src_ref_index
, src
);
1360 if (!string_list_has_string(&src_ref_index
,
1362 ref
->peer_ref
= alloc_delete_ref();
1366 string_list_clear(&src_ref_index
, 0);
1374 void set_ref_status_for_push(struct ref
*remote_refs
, int send_mirror
,
1379 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
1380 int force_ref_update
= ref
->force
|| force_update
;
1381 int reject_reason
= 0;
1384 oidcpy(&ref
->new_oid
, &ref
->peer_ref
->new_oid
);
1385 else if (!send_mirror
)
1388 ref
->deletion
= is_null_oid(&ref
->new_oid
);
1389 if (!ref
->deletion
&&
1390 !oidcmp(&ref
->old_oid
, &ref
->new_oid
)) {
1391 ref
->status
= REF_STATUS_UPTODATE
;
1396 * If the remote ref has moved and is now different
1397 * from what we expect, reject any push.
1399 * It also is an error if the user told us to check
1400 * with the remote-tracking branch to find the value
1401 * to expect, but we did not have such a tracking
1404 if (ref
->expect_old_sha1
) {
1405 if (oidcmp(&ref
->old_oid
, &ref
->old_oid_expect
))
1406 reject_reason
= REF_STATUS_REJECT_STALE
;
1408 /* If the ref isn't stale then force the update. */
1409 force_ref_update
= 1;
1413 * If the update isn't already rejected then check
1414 * the usual "must fast-forward" rules.
1416 * Decide whether an individual refspec A:B can be
1417 * pushed. The push will succeed if any of the
1418 * following are true:
1420 * (1) the remote reference B does not exist
1422 * (2) the remote reference B is being removed (i.e.,
1423 * pushing :B where no source is specified)
1425 * (3) the destination is not under refs/tags/, and
1426 * if the old and new value is a commit, the new
1427 * is a descendant of the old.
1429 * (4) it is forced using the +A:B notation, or by
1430 * passing the --force argument
1433 if (!reject_reason
&& !ref
->deletion
&& !is_null_oid(&ref
->old_oid
)) {
1434 if (starts_with(ref
->name
, "refs/tags/"))
1435 reject_reason
= REF_STATUS_REJECT_ALREADY_EXISTS
;
1436 else if (!has_object_file(&ref
->old_oid
))
1437 reject_reason
= REF_STATUS_REJECT_FETCH_FIRST
;
1438 else if (!lookup_commit_reference_gently(&ref
->old_oid
, 1) ||
1439 !lookup_commit_reference_gently(&ref
->new_oid
, 1))
1440 reject_reason
= REF_STATUS_REJECT_NEEDS_FORCE
;
1441 else if (!ref_newer(&ref
->new_oid
, &ref
->old_oid
))
1442 reject_reason
= REF_STATUS_REJECT_NONFASTFORWARD
;
1446 * "--force" will defeat any rejection implemented
1447 * by the rules above.
1449 if (!force_ref_update
)
1450 ref
->status
= reject_reason
;
1451 else if (reject_reason
)
1452 ref
->forced_update
= 1;
1456 static void set_merge(struct branch
*ret
)
1458 struct remote
*remote
;
1460 struct object_id oid
;
1464 return; /* no branch */
1466 return; /* already run */
1467 if (!ret
->remote_name
|| !ret
->merge_nr
) {
1469 * no merge config; let's make sure we don't confuse callers
1470 * with a non-zero merge_nr but a NULL merge
1476 remote
= remote_get(ret
->remote_name
);
1478 ret
->merge
= xcalloc(ret
->merge_nr
, sizeof(*ret
->merge
));
1479 for (i
= 0; i
< ret
->merge_nr
; i
++) {
1480 ret
->merge
[i
] = xcalloc(1, sizeof(**ret
->merge
));
1481 ret
->merge
[i
]->src
= xstrdup(ret
->merge_name
[i
]);
1482 if (!remote_find_tracking(remote
, ret
->merge
[i
]) ||
1483 strcmp(ret
->remote_name
, "."))
1485 if (dwim_ref(ret
->merge_name
[i
], strlen(ret
->merge_name
[i
]),
1487 ret
->merge
[i
]->dst
= ref
;
1489 ret
->merge
[i
]->dst
= xstrdup(ret
->merge_name
[i
]);
1493 struct branch
*branch_get(const char *name
)
1498 if (!name
|| !*name
|| !strcmp(name
, "HEAD"))
1499 ret
= current_branch
;
1501 ret
= make_branch(name
, 0);
1506 int branch_has_merge_config(struct branch
*branch
)
1508 return branch
&& !!branch
->merge
;
1511 int branch_merge_matches(struct branch
*branch
,
1513 const char *refname
)
1515 if (!branch
|| i
< 0 || i
>= branch
->merge_nr
)
1517 return refname_match(branch
->merge
[i
]->src
, refname
);
1520 __attribute__((format (printf
,2,3)))
1521 static const char *error_buf(struct strbuf
*err
, const char *fmt
, ...)
1526 strbuf_vaddf(err
, fmt
, ap
);
1532 const char *branch_get_upstream(struct branch
*branch
, struct strbuf
*err
)
1535 return error_buf(err
, _("HEAD does not point to a branch"));
1537 if (!branch
->merge
|| !branch
->merge
[0]) {
1539 * no merge config; is it because the user didn't define any,
1540 * or because it is not a real branch, and get_branch
1543 if (!ref_exists(branch
->refname
))
1544 return error_buf(err
, _("no such branch: '%s'"),
1546 return error_buf(err
,
1547 _("no upstream configured for branch '%s'"),
1551 if (!branch
->merge
[0]->dst
)
1552 return error_buf(err
,
1553 _("upstream branch '%s' not stored as a remote-tracking branch"),
1554 branch
->merge
[0]->src
);
1556 return branch
->merge
[0]->dst
;
1559 static const char *tracking_for_push_dest(struct remote
*remote
,
1560 const char *refname
,
1565 ret
= apply_refspecs(&remote
->fetch
, refname
);
1567 return error_buf(err
,
1568 _("push destination '%s' on remote '%s' has no local tracking branch"),
1569 refname
, remote
->name
);
1573 static const char *branch_get_push_1(struct branch
*branch
, struct strbuf
*err
)
1575 struct remote
*remote
;
1577 remote
= remote_get(pushremote_for_branch(branch
, NULL
));
1579 return error_buf(err
,
1580 _("branch '%s' has no remote for pushing"),
1583 if (remote
->push
.nr
) {
1587 dst
= apply_refspecs(&remote
->push
, branch
->refname
);
1589 return error_buf(err
,
1590 _("push refspecs for '%s' do not include '%s'"),
1591 remote
->name
, branch
->name
);
1593 ret
= tracking_for_push_dest(remote
, dst
, err
);
1599 return tracking_for_push_dest(remote
, branch
->refname
, err
);
1601 switch (push_default
) {
1602 case PUSH_DEFAULT_NOTHING
:
1603 return error_buf(err
, _("push has no destination (push.default is 'nothing')"));
1605 case PUSH_DEFAULT_MATCHING
:
1606 case PUSH_DEFAULT_CURRENT
:
1607 return tracking_for_push_dest(remote
, branch
->refname
, err
);
1609 case PUSH_DEFAULT_UPSTREAM
:
1610 return branch_get_upstream(branch
, err
);
1612 case PUSH_DEFAULT_UNSPECIFIED
:
1613 case PUSH_DEFAULT_SIMPLE
:
1615 const char *up
, *cur
;
1617 up
= branch_get_upstream(branch
, err
);
1620 cur
= tracking_for_push_dest(remote
, branch
->refname
, err
);
1623 if (strcmp(cur
, up
))
1624 return error_buf(err
,
1625 _("cannot resolve 'simple' push to a single destination"));
1630 BUG("unhandled push situation");
1633 const char *branch_get_push(struct branch
*branch
, struct strbuf
*err
)
1636 return error_buf(err
, _("HEAD does not point to a branch"));
1638 if (!branch
->push_tracking_ref
)
1639 branch
->push_tracking_ref
= branch_get_push_1(branch
, err
);
1640 return branch
->push_tracking_ref
;
1643 static int ignore_symref_update(const char *refname
)
1647 if (!resolve_ref_unsafe(refname
, 0, NULL
, &flag
))
1648 return 0; /* non-existing refs are OK */
1649 return (flag
& REF_ISSYMREF
);
1653 * Create and return a list of (struct ref) consisting of copies of
1654 * each remote_ref that matches refspec. refspec must be a pattern.
1655 * Fill in the copies' peer_ref to describe the local tracking refs to
1656 * which they map. Omit any references that would map to an existing
1657 * local symbolic ref.
1659 static struct ref
*get_expanded_map(const struct ref
*remote_refs
,
1660 const struct refspec_item
*refspec
)
1662 const struct ref
*ref
;
1663 struct ref
*ret
= NULL
;
1664 struct ref
**tail
= &ret
;
1666 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
1667 char *expn_name
= NULL
;
1669 if (strchr(ref
->name
, '^'))
1670 continue; /* a dereference item */
1671 if (match_name_with_pattern(refspec
->src
, ref
->name
,
1672 refspec
->dst
, &expn_name
) &&
1673 !ignore_symref_update(expn_name
)) {
1674 struct ref
*cpy
= copy_ref(ref
);
1676 cpy
->peer_ref
= alloc_ref(expn_name
);
1678 cpy
->peer_ref
->force
= 1;
1688 static const struct ref
*find_ref_by_name_abbrev(const struct ref
*refs
, const char *name
)
1690 const struct ref
*ref
;
1691 for (ref
= refs
; ref
; ref
= ref
->next
) {
1692 if (refname_match(name
, ref
->name
))
1698 struct ref
*get_remote_ref(const struct ref
*remote_refs
, const char *name
)
1700 const struct ref
*ref
= find_ref_by_name_abbrev(remote_refs
, name
);
1705 return copy_ref(ref
);
1708 static struct ref
*get_local_ref(const char *name
)
1710 if (!name
|| name
[0] == '\0')
1713 if (starts_with(name
, "refs/"))
1714 return alloc_ref(name
);
1716 if (starts_with(name
, "heads/") ||
1717 starts_with(name
, "tags/") ||
1718 starts_with(name
, "remotes/"))
1719 return alloc_ref_with_prefix("refs/", 5, name
);
1721 return alloc_ref_with_prefix("refs/heads/", 11, name
);
1724 int get_fetch_map(const struct ref
*remote_refs
,
1725 const struct refspec_item
*refspec
,
1729 struct ref
*ref_map
, **rmp
;
1731 if (refspec
->pattern
) {
1732 ref_map
= get_expanded_map(remote_refs
, refspec
);
1734 const char *name
= refspec
->src
[0] ? refspec
->src
: "HEAD";
1736 if (refspec
->exact_sha1
) {
1737 ref_map
= alloc_ref(name
);
1738 get_oid_hex(name
, &ref_map
->old_oid
);
1739 ref_map
->exact_oid
= 1;
1741 ref_map
= get_remote_ref(remote_refs
, name
);
1743 if (!missing_ok
&& !ref_map
)
1744 die("Couldn't find remote ref %s", name
);
1746 ref_map
->peer_ref
= get_local_ref(refspec
->dst
);
1747 if (ref_map
->peer_ref
&& refspec
->force
)
1748 ref_map
->peer_ref
->force
= 1;
1752 for (rmp
= &ref_map
; *rmp
; ) {
1753 if ((*rmp
)->peer_ref
) {
1754 if (!starts_with((*rmp
)->peer_ref
->name
, "refs/") ||
1755 check_refname_format((*rmp
)->peer_ref
->name
, 0)) {
1756 struct ref
*ignore
= *rmp
;
1757 error("* Ignoring funny ref '%s' locally",
1758 (*rmp
)->peer_ref
->name
);
1759 *rmp
= (*rmp
)->next
;
1760 free(ignore
->peer_ref
);
1765 rmp
= &((*rmp
)->next
);
1769 tail_link_ref(ref_map
, tail
);
1774 int resolve_remote_symref(struct ref
*ref
, struct ref
*list
)
1778 for (; list
; list
= list
->next
)
1779 if (!strcmp(ref
->symref
, list
->name
)) {
1780 oidcpy(&ref
->old_oid
, &list
->old_oid
);
1786 static void unmark_and_free(struct commit_list
*list
, unsigned int mark
)
1789 struct commit
*commit
= pop_commit(&list
);
1790 commit
->object
.flags
&= ~mark
;
1794 int ref_newer(const struct object_id
*new_oid
, const struct object_id
*old_oid
)
1797 struct commit
*old_commit
, *new_commit
;
1798 struct commit_list
*list
, *used
;
1802 * Both new_commit and old_commit must be commit-ish and new_commit is descendant of
1803 * old_commit. Otherwise we require --force.
1805 o
= deref_tag(parse_object(old_oid
), NULL
, 0);
1806 if (!o
|| o
->type
!= OBJ_COMMIT
)
1808 old_commit
= (struct commit
*) o
;
1810 o
= deref_tag(parse_object(new_oid
), NULL
, 0);
1811 if (!o
|| o
->type
!= OBJ_COMMIT
)
1813 new_commit
= (struct commit
*) o
;
1815 if (parse_commit(new_commit
) < 0)
1819 commit_list_insert(new_commit
, &list
);
1821 new_commit
= pop_most_recent_commit(&list
, TMP_MARK
);
1822 commit_list_insert(new_commit
, &used
);
1823 if (new_commit
== old_commit
) {
1828 unmark_and_free(list
, TMP_MARK
);
1829 unmark_and_free(used
, TMP_MARK
);
1834 * Lookup the upstream branch for the given branch and if present, optionally
1835 * compute the commit ahead/behind values for the pair.
1837 * If abf is AHEAD_BEHIND_FULL, compute the full ahead/behind and return the
1838 * counts in *num_ours and *num_theirs. If abf is AHEAD_BEHIND_QUICK, skip
1839 * the (potentially expensive) a/b computation (*num_ours and *num_theirs are
1842 * The name of the upstream branch (or NULL if no upstream is defined) is
1843 * returned via *upstream_name, if it is not itself NULL.
1845 * Returns -1 if num_ours and num_theirs could not be filled in (e.g., no
1846 * upstream defined, or ref does not exist). Returns 0 if the commits are
1847 * identical. Returns 1 if commits are different.
1849 int stat_tracking_info(struct branch
*branch
, int *num_ours
, int *num_theirs
,
1850 const char **upstream_name
, enum ahead_behind_flags abf
)
1852 struct object_id oid
;
1853 struct commit
*ours
, *theirs
;
1854 struct rev_info revs
;
1856 struct argv_array argv
= ARGV_ARRAY_INIT
;
1858 /* Cannot stat unless we are marked to build on top of somebody else. */
1859 base
= branch_get_upstream(branch
, NULL
);
1861 *upstream_name
= base
;
1865 /* Cannot stat if what we used to build on no longer exists */
1866 if (read_ref(base
, &oid
))
1868 theirs
= lookup_commit_reference(&oid
);
1872 if (read_ref(branch
->refname
, &oid
))
1874 ours
= lookup_commit_reference(&oid
);
1878 *num_theirs
= *num_ours
= 0;
1880 /* are we the same? */
1883 if (abf
== AHEAD_BEHIND_QUICK
)
1885 if (abf
!= AHEAD_BEHIND_FULL
)
1886 BUG("stat_tracking_info: invalid abf '%d'", abf
);
1888 /* Run "rev-list --left-right ours...theirs" internally... */
1889 argv_array_push(&argv
, ""); /* ignored */
1890 argv_array_push(&argv
, "--left-right");
1891 argv_array_pushf(&argv
, "%s...%s",
1892 oid_to_hex(&ours
->object
.oid
),
1893 oid_to_hex(&theirs
->object
.oid
));
1894 argv_array_push(&argv
, "--");
1896 init_revisions(&revs
, NULL
);
1897 setup_revisions(argv
.argc
, argv
.argv
, &revs
, NULL
);
1898 if (prepare_revision_walk(&revs
))
1899 die("revision walk setup failed");
1901 /* ... and count the commits on each side. */
1903 struct commit
*c
= get_revision(&revs
);
1906 if (c
->object
.flags
& SYMMETRIC_LEFT
)
1912 /* clear object flags smudged by the above traversal */
1913 clear_commit_marks(ours
, ALL_REV_FLAGS
);
1914 clear_commit_marks(theirs
, ALL_REV_FLAGS
);
1916 argv_array_clear(&argv
);
1921 * Return true when there is anything to report, otherwise false.
1923 int format_tracking_info(struct branch
*branch
, struct strbuf
*sb
,
1924 enum ahead_behind_flags abf
)
1926 int ours
, theirs
, sti
;
1927 const char *full_base
;
1929 int upstream_is_gone
= 0;
1931 sti
= stat_tracking_info(branch
, &ours
, &theirs
, &full_base
, abf
);
1935 upstream_is_gone
= 1;
1938 base
= shorten_unambiguous_ref(full_base
, 0);
1939 if (upstream_is_gone
) {
1941 _("Your branch is based on '%s', but the upstream is gone.\n"),
1943 if (advice_status_hints
)
1945 _(" (use \"git branch --unset-upstream\" to fixup)\n"));
1948 _("Your branch is up to date with '%s'.\n"),
1950 } else if (abf
== AHEAD_BEHIND_QUICK
) {
1952 _("Your branch and '%s' refer to different commits.\n"),
1954 if (advice_status_hints
)
1955 strbuf_addf(sb
, _(" (use \"%s\" for details)\n"),
1956 "git status --ahead-behind");
1957 } else if (!theirs
) {
1959 Q_("Your branch is ahead of '%s' by %d commit.\n",
1960 "Your branch is ahead of '%s' by %d commits.\n",
1963 if (advice_status_hints
)
1965 _(" (use \"git push\" to publish your local commits)\n"));
1968 Q_("Your branch is behind '%s' by %d commit, "
1969 "and can be fast-forwarded.\n",
1970 "Your branch is behind '%s' by %d commits, "
1971 "and can be fast-forwarded.\n",
1974 if (advice_status_hints
)
1976 _(" (use \"git pull\" to update your local branch)\n"));
1979 Q_("Your branch and '%s' have diverged,\n"
1980 "and have %d and %d different commit each, "
1982 "Your branch and '%s' have diverged,\n"
1983 "and have %d and %d different commits each, "
1986 base
, ours
, theirs
);
1987 if (advice_status_hints
)
1989 _(" (use \"git pull\" to merge the remote branch into yours)\n"));
1995 static int one_local_ref(const char *refname
, const struct object_id
*oid
,
1996 int flag
, void *cb_data
)
1998 struct ref
***local_tail
= cb_data
;
2001 /* we already know it starts with refs/ to get here */
2002 if (check_refname_format(refname
+ 5, 0))
2005 ref
= alloc_ref(refname
);
2006 oidcpy(&ref
->new_oid
, oid
);
2008 *local_tail
= &ref
->next
;
2012 struct ref
*get_local_heads(void)
2014 struct ref
*local_refs
= NULL
, **local_tail
= &local_refs
;
2016 for_each_ref(one_local_ref
, &local_tail
);
2020 struct ref
*guess_remote_head(const struct ref
*head
,
2021 const struct ref
*refs
,
2024 const struct ref
*r
;
2025 struct ref
*list
= NULL
;
2026 struct ref
**tail
= &list
;
2032 * Some transports support directly peeking at
2033 * where HEAD points; if that is the case, then
2034 * we don't have to guess.
2037 return copy_ref(find_ref_by_name(refs
, head
->symref
));
2039 /* If refs/heads/master could be right, it is. */
2041 r
= find_ref_by_name(refs
, "refs/heads/master");
2042 if (r
&& !oidcmp(&r
->old_oid
, &head
->old_oid
))
2046 /* Look for another ref that points there */
2047 for (r
= refs
; r
; r
= r
->next
) {
2049 starts_with(r
->name
, "refs/heads/") &&
2050 !oidcmp(&r
->old_oid
, &head
->old_oid
)) {
2051 *tail
= copy_ref(r
);
2052 tail
= &((*tail
)->next
);
2061 struct stale_heads_info
{
2062 struct string_list
*ref_names
;
2063 struct ref
**stale_refs_tail
;
2067 static int get_stale_heads_cb(const char *refname
, const struct object_id
*oid
,
2068 int flags
, void *cb_data
)
2070 struct stale_heads_info
*info
= cb_data
;
2071 struct string_list matches
= STRING_LIST_INIT_DUP
;
2072 struct refspec_item query
;
2074 memset(&query
, 0, sizeof(struct refspec_item
));
2075 query
.dst
= (char *)refname
;
2077 query_refspecs_multiple(info
->rs
, &query
, &matches
);
2078 if (matches
.nr
== 0)
2079 goto clean_exit
; /* No matches */
2082 * If we did find a suitable refspec and it's not a symref and
2083 * it's not in the list of refs that currently exist in that
2084 * remote, we consider it to be stale. In order to deal with
2085 * overlapping refspecs, we need to go over all of the
2088 if (flags
& REF_ISSYMREF
)
2091 for (i
= 0; stale
&& i
< matches
.nr
; i
++)
2092 if (string_list_has_string(info
->ref_names
, matches
.items
[i
].string
))
2096 struct ref
*ref
= make_linked_ref(refname
, &info
->stale_refs_tail
);
2097 oidcpy(&ref
->new_oid
, oid
);
2101 string_list_clear(&matches
, 0);
2105 struct ref
*get_stale_heads(struct refspec
*rs
, struct ref
*fetch_map
)
2107 struct ref
*ref
, *stale_refs
= NULL
;
2108 struct string_list ref_names
= STRING_LIST_INIT_NODUP
;
2109 struct stale_heads_info info
;
2111 info
.ref_names
= &ref_names
;
2112 info
.stale_refs_tail
= &stale_refs
;
2114 for (ref
= fetch_map
; ref
; ref
= ref
->next
)
2115 string_list_append(&ref_names
, ref
->name
);
2116 string_list_sort(&ref_names
);
2117 for_each_ref(get_stale_heads_cb
, &info
);
2118 string_list_clear(&ref_names
, 0);
2125 static void clear_cas_option(struct push_cas_option
*cas
)
2129 for (i
= 0; i
< cas
->nr
; i
++)
2130 free(cas
->entry
[i
].refname
);
2132 memset(cas
, 0, sizeof(*cas
));
2135 static struct push_cas
*add_cas_entry(struct push_cas_option
*cas
,
2136 const char *refname
,
2139 struct push_cas
*entry
;
2140 ALLOC_GROW(cas
->entry
, cas
->nr
+ 1, cas
->alloc
);
2141 entry
= &cas
->entry
[cas
->nr
++];
2142 memset(entry
, 0, sizeof(*entry
));
2143 entry
->refname
= xmemdupz(refname
, refnamelen
);
2147 static int parse_push_cas_option(struct push_cas_option
*cas
, const char *arg
, int unset
)
2150 struct push_cas
*entry
;
2153 /* "--no-<option>" */
2154 clear_cas_option(cas
);
2159 /* just "--<option>" */
2160 cas
->use_tracking_for_rest
= 1;
2164 /* "--<option>=refname" or "--<option>=refname:value" */
2165 colon
= strchrnul(arg
, ':');
2166 entry
= add_cas_entry(cas
, arg
, colon
- arg
);
2168 entry
->use_tracking
= 1;
2170 oidclr(&entry
->expect
);
2171 else if (get_oid(colon
+ 1, &entry
->expect
))
2172 return error("cannot parse expected object name '%s'", colon
+ 1);
2176 int parseopt_push_cas_option(const struct option
*opt
, const char *arg
, int unset
)
2178 return parse_push_cas_option(opt
->value
, arg
, unset
);
2181 int is_empty_cas(const struct push_cas_option
*cas
)
2183 return !cas
->use_tracking_for_rest
&& !cas
->nr
;
2187 * Look at remote.fetch refspec and see if we have a remote
2188 * tracking branch for the refname there. Fill its current
2190 * If we cannot do so, return negative to signal an error.
2192 static int remote_tracking(struct remote
*remote
, const char *refname
,
2193 struct object_id
*oid
)
2197 dst
= apply_refspecs(&remote
->fetch
, refname
);
2199 return -1; /* no tracking ref for refname at remote */
2200 if (read_ref(dst
, oid
))
2201 return -1; /* we know what the tracking ref is but we cannot read it */
2205 static void apply_cas(struct push_cas_option
*cas
,
2206 struct remote
*remote
,
2211 /* Find an explicit --<option>=<name>[:<value>] entry */
2212 for (i
= 0; i
< cas
->nr
; i
++) {
2213 struct push_cas
*entry
= &cas
->entry
[i
];
2214 if (!refname_match(entry
->refname
, ref
->name
))
2216 ref
->expect_old_sha1
= 1;
2217 if (!entry
->use_tracking
)
2218 oidcpy(&ref
->old_oid_expect
, &entry
->expect
);
2219 else if (remote_tracking(remote
, ref
->name
, &ref
->old_oid_expect
))
2220 oidclr(&ref
->old_oid_expect
);
2224 /* Are we using "--<option>" to cover all? */
2225 if (!cas
->use_tracking_for_rest
)
2228 ref
->expect_old_sha1
= 1;
2229 if (remote_tracking(remote
, ref
->name
, &ref
->old_oid_expect
))
2230 oidclr(&ref
->old_oid_expect
);
2233 void apply_push_cas(struct push_cas_option
*cas
,
2234 struct remote
*remote
,
2235 struct ref
*remote_refs
)
2238 for (ref
= remote_refs
; ref
; ref
= ref
->next
)
2239 apply_cas(cas
, remote
, ref
);