6 #include "object-store.h"
12 #include "string-list.h"
13 #include "mergesort.h"
14 #include "argv-array.h"
15 #include "commit-reach.h"
17 enum map_direction
{ FROM_SRC
, FROM_DST
};
19 struct counted_string
{
26 struct counted_string
*instead_of
;
31 struct rewrite
**rewrite
;
36 static struct remote
**remotes
;
37 static int remotes_alloc
;
38 static int remotes_nr
;
39 static struct hashmap remotes_hash
;
41 static struct branch
**branches
;
42 static int branches_alloc
;
43 static int branches_nr
;
45 static struct branch
*current_branch
;
46 static const char *pushremote_name
;
48 static struct rewrites rewrites
;
49 static struct rewrites rewrites_push
;
51 static int valid_remote(const struct remote
*remote
)
53 return (!!remote
->url
) || (!!remote
->foreign_vcs
);
56 static const char *alias_url(const char *url
, struct rewrites
*r
)
59 struct counted_string
*longest
;
64 for (i
= 0; i
< r
->rewrite_nr
; i
++) {
67 for (j
= 0; j
< r
->rewrite
[i
]->instead_of_nr
; j
++) {
68 if (starts_with(url
, r
->rewrite
[i
]->instead_of
[j
].s
) &&
70 longest
->len
< r
->rewrite
[i
]->instead_of
[j
].len
)) {
71 longest
= &(r
->rewrite
[i
]->instead_of
[j
]);
79 return xstrfmt("%s%s", r
->rewrite
[longest_i
]->base
, url
+ longest
->len
);
82 static void add_url(struct remote
*remote
, const char *url
)
84 ALLOC_GROW(remote
->url
, remote
->url_nr
+ 1, remote
->url_alloc
);
85 remote
->url
[remote
->url_nr
++] = url
;
88 static void add_pushurl(struct remote
*remote
, const char *pushurl
)
90 ALLOC_GROW(remote
->pushurl
, remote
->pushurl_nr
+ 1, remote
->pushurl_alloc
);
91 remote
->pushurl
[remote
->pushurl_nr
++] = pushurl
;
94 static void add_pushurl_alias(struct remote
*remote
, const char *url
)
96 const char *pushurl
= alias_url(url
, &rewrites_push
);
98 add_pushurl(remote
, pushurl
);
101 static void add_url_alias(struct remote
*remote
, const char *url
)
103 add_url(remote
, alias_url(url
, &rewrites
));
104 add_pushurl_alias(remote
, url
);
107 struct remotes_hash_key
{
112 static int remotes_hash_cmp(const void *unused_cmp_data
,
114 const void *entry_or_key
,
117 const struct remote
*a
= entry
;
118 const struct remote
*b
= entry_or_key
;
119 const struct remotes_hash_key
*key
= keydata
;
122 return strncmp(a
->name
, key
->str
, key
->len
) || a
->name
[key
->len
];
124 return strcmp(a
->name
, b
->name
);
127 static inline void init_remotes_hash(void)
129 if (!remotes_hash
.cmpfn
)
130 hashmap_init(&remotes_hash
, remotes_hash_cmp
, NULL
, 0);
133 static struct remote
*make_remote(const char *name
, int len
)
135 struct remote
*ret
, *replaced
;
136 struct remotes_hash_key lookup
;
137 struct hashmap_entry lookup_entry
;
145 hashmap_entry_init(&lookup_entry
, memhash(name
, len
));
147 if ((ret
= hashmap_get(&remotes_hash
, &lookup_entry
, &lookup
)) != NULL
)
150 ret
= xcalloc(1, sizeof(struct remote
));
151 ret
->prune
= -1; /* unspecified */
152 ret
->prune_tags
= -1; /* unspecified */
153 ret
->name
= xstrndup(name
, len
);
154 refspec_init(&ret
->push
, REFSPEC_PUSH
);
155 refspec_init(&ret
->fetch
, REFSPEC_FETCH
);
157 ALLOC_GROW(remotes
, remotes_nr
+ 1, remotes_alloc
);
158 remotes
[remotes_nr
++] = ret
;
160 hashmap_entry_init(ret
, lookup_entry
.hash
);
161 replaced
= hashmap_put(&remotes_hash
, ret
);
162 assert(replaced
== NULL
); /* no previous entry overwritten */
166 static void add_merge(struct branch
*branch
, const char *name
)
168 ALLOC_GROW(branch
->merge_name
, branch
->merge_nr
+ 1,
169 branch
->merge_alloc
);
170 branch
->merge_name
[branch
->merge_nr
++] = name
;
173 static struct branch
*make_branch(const char *name
, int len
)
178 for (i
= 0; i
< branches_nr
; i
++) {
179 if (len
? (!strncmp(name
, branches
[i
]->name
, len
) &&
180 !branches
[i
]->name
[len
]) :
181 !strcmp(name
, branches
[i
]->name
))
185 ALLOC_GROW(branches
, branches_nr
+ 1, branches_alloc
);
186 ret
= xcalloc(1, sizeof(struct branch
));
187 branches
[branches_nr
++] = ret
;
189 ret
->name
= xstrndup(name
, len
);
191 ret
->name
= xstrdup(name
);
192 ret
->refname
= xstrfmt("refs/heads/%s", ret
->name
);
197 static struct rewrite
*make_rewrite(struct rewrites
*r
, const char *base
, int len
)
202 for (i
= 0; i
< r
->rewrite_nr
; i
++) {
204 ? (len
== r
->rewrite
[i
]->baselen
&&
205 !strncmp(base
, r
->rewrite
[i
]->base
, len
))
206 : !strcmp(base
, r
->rewrite
[i
]->base
))
207 return r
->rewrite
[i
];
210 ALLOC_GROW(r
->rewrite
, r
->rewrite_nr
+ 1, r
->rewrite_alloc
);
211 ret
= xcalloc(1, sizeof(struct rewrite
));
212 r
->rewrite
[r
->rewrite_nr
++] = ret
;
214 ret
->base
= xstrndup(base
, len
);
218 ret
->base
= xstrdup(base
);
219 ret
->baselen
= strlen(base
);
224 static void add_instead_of(struct rewrite
*rewrite
, const char *instead_of
)
226 ALLOC_GROW(rewrite
->instead_of
, rewrite
->instead_of_nr
+ 1, rewrite
->instead_of_alloc
);
227 rewrite
->instead_of
[rewrite
->instead_of_nr
].s
= instead_of
;
228 rewrite
->instead_of
[rewrite
->instead_of_nr
].len
= strlen(instead_of
);
229 rewrite
->instead_of_nr
++;
232 static const char *skip_spaces(const char *s
)
239 static void read_remotes_file(struct remote
*remote
)
241 struct strbuf buf
= STRBUF_INIT
;
242 FILE *f
= fopen_or_warn(git_path("remotes/%s", remote
->name
), "r");
246 remote
->configured_in_repo
= 1;
247 remote
->origin
= REMOTE_REMOTES
;
248 while (strbuf_getline(&buf
, f
) != EOF
) {
253 if (skip_prefix(buf
.buf
, "URL:", &v
))
254 add_url_alias(remote
, xstrdup(skip_spaces(v
)));
255 else if (skip_prefix(buf
.buf
, "Push:", &v
))
256 refspec_append(&remote
->push
, skip_spaces(v
));
257 else if (skip_prefix(buf
.buf
, "Pull:", &v
))
258 refspec_append(&remote
->fetch
, skip_spaces(v
));
260 strbuf_release(&buf
);
264 static void read_branches_file(struct remote
*remote
)
267 struct strbuf buf
= STRBUF_INIT
;
268 FILE *f
= fopen_or_warn(git_path("branches/%s", remote
->name
), "r");
273 strbuf_getline_lf(&buf
, f
);
277 strbuf_release(&buf
);
281 remote
->configured_in_repo
= 1;
282 remote
->origin
= REMOTE_BRANCHES
;
285 * The branches file would have URL and optionally
286 * #branch specified. The "master" (or specified) branch is
287 * fetched and stored in the local branch matching the
290 frag
= strchr(buf
.buf
, '#');
296 add_url_alias(remote
, strbuf_detach(&buf
, NULL
));
297 strbuf_addf(&buf
, "refs/heads/%s:refs/heads/%s",
299 refspec_append(&remote
->fetch
, buf
.buf
);
302 * Cogito compatible push: push current HEAD to remote #branch
303 * (master if missing)
306 strbuf_addf(&buf
, "HEAD:refs/heads/%s", frag
);
307 refspec_append(&remote
->push
, buf
.buf
);
308 remote
->fetch_tags
= 1; /* always auto-follow */
309 strbuf_release(&buf
);
312 static int handle_config(const char *key
, const char *value
, void *cb
)
317 struct remote
*remote
;
318 struct branch
*branch
;
319 if (parse_config_key(key
, "branch", &name
, &namelen
, &subkey
) >= 0) {
322 branch
= make_branch(name
, namelen
);
323 if (!strcmp(subkey
, "remote")) {
324 return git_config_string(&branch
->remote_name
, key
, value
);
325 } else if (!strcmp(subkey
, "pushremote")) {
326 return git_config_string(&branch
->pushremote_name
, key
, value
);
327 } else if (!strcmp(subkey
, "merge")) {
329 return config_error_nonbool(key
);
330 add_merge(branch
, xstrdup(value
));
334 if (parse_config_key(key
, "url", &name
, &namelen
, &subkey
) >= 0) {
335 struct rewrite
*rewrite
;
338 if (!strcmp(subkey
, "insteadof")) {
339 rewrite
= make_rewrite(&rewrites
, name
, namelen
);
341 return config_error_nonbool(key
);
342 add_instead_of(rewrite
, xstrdup(value
));
343 } else if (!strcmp(subkey
, "pushinsteadof")) {
344 rewrite
= make_rewrite(&rewrites_push
, name
, namelen
);
346 return config_error_nonbool(key
);
347 add_instead_of(rewrite
, xstrdup(value
));
351 if (parse_config_key(key
, "remote", &name
, &namelen
, &subkey
) < 0)
354 /* Handle remote.* variables */
355 if (!name
&& !strcmp(subkey
, "pushdefault"))
356 return git_config_string(&pushremote_name
, key
, value
);
360 /* Handle remote.<name>.* variables */
362 warning("Config remote shorthand cannot begin with '/': %s",
366 remote
= make_remote(name
, namelen
);
367 remote
->origin
= REMOTE_CONFIG
;
368 if (current_config_scope() == CONFIG_SCOPE_REPO
)
369 remote
->configured_in_repo
= 1;
370 if (!strcmp(subkey
, "mirror"))
371 remote
->mirror
= git_config_bool(key
, value
);
372 else if (!strcmp(subkey
, "skipdefaultupdate"))
373 remote
->skip_default_update
= git_config_bool(key
, value
);
374 else if (!strcmp(subkey
, "skipfetchall"))
375 remote
->skip_default_update
= git_config_bool(key
, value
);
376 else if (!strcmp(subkey
, "prune"))
377 remote
->prune
= git_config_bool(key
, value
);
378 else if (!strcmp(subkey
, "prunetags"))
379 remote
->prune_tags
= git_config_bool(key
, value
);
380 else if (!strcmp(subkey
, "url")) {
382 if (git_config_string(&v
, key
, value
))
385 } else if (!strcmp(subkey
, "pushurl")) {
387 if (git_config_string(&v
, key
, value
))
389 add_pushurl(remote
, v
);
390 } else if (!strcmp(subkey
, "push")) {
392 if (git_config_string(&v
, key
, value
))
394 refspec_append(&remote
->push
, v
);
396 } else if (!strcmp(subkey
, "fetch")) {
398 if (git_config_string(&v
, key
, value
))
400 refspec_append(&remote
->fetch
, v
);
402 } else if (!strcmp(subkey
, "receivepack")) {
404 if (git_config_string(&v
, key
, value
))
406 if (!remote
->receivepack
)
407 remote
->receivepack
= v
;
409 error(_("more than one receivepack given, using the first"));
410 } else if (!strcmp(subkey
, "uploadpack")) {
412 if (git_config_string(&v
, key
, value
))
414 if (!remote
->uploadpack
)
415 remote
->uploadpack
= v
;
417 error(_("more than one uploadpack given, using the first"));
418 } else if (!strcmp(subkey
, "tagopt")) {
419 if (!strcmp(value
, "--no-tags"))
420 remote
->fetch_tags
= -1;
421 else if (!strcmp(value
, "--tags"))
422 remote
->fetch_tags
= 2;
423 } else if (!strcmp(subkey
, "proxy")) {
424 return git_config_string((const char **)&remote
->http_proxy
,
426 } else if (!strcmp(subkey
, "proxyauthmethod")) {
427 return git_config_string((const char **)&remote
->http_proxy_authmethod
,
429 } else if (!strcmp(subkey
, "vcs")) {
430 return git_config_string(&remote
->foreign_vcs
, key
, value
);
435 static void alias_all_urls(void)
438 for (i
= 0; i
< remotes_nr
; i
++) {
439 int add_pushurl_aliases
;
442 for (j
= 0; j
< remotes
[i
]->pushurl_nr
; j
++) {
443 remotes
[i
]->pushurl
[j
] = alias_url(remotes
[i
]->pushurl
[j
], &rewrites
);
445 add_pushurl_aliases
= remotes
[i
]->pushurl_nr
== 0;
446 for (j
= 0; j
< remotes
[i
]->url_nr
; j
++) {
447 if (add_pushurl_aliases
)
448 add_pushurl_alias(remotes
[i
], remotes
[i
]->url
[j
]);
449 remotes
[i
]->url
[j
] = alias_url(remotes
[i
]->url
[j
], &rewrites
);
454 static void read_config(void)
463 current_branch
= NULL
;
464 if (startup_info
->have_repository
) {
465 const char *head_ref
= resolve_ref_unsafe("HEAD", 0, NULL
, &flag
);
466 if (head_ref
&& (flag
& REF_ISSYMREF
) &&
467 skip_prefix(head_ref
, "refs/heads/", &head_ref
)) {
468 current_branch
= make_branch(head_ref
, 0);
471 git_config(handle_config
, NULL
);
475 static int valid_remote_nick(const char *name
)
477 if (!name
[0] || is_dot_or_dotdot(name
))
480 /* remote nicknames cannot contain slashes */
482 if (is_dir_sep(*name
++))
487 const char *remote_for_branch(struct branch
*branch
, int *explicit)
489 if (branch
&& branch
->remote_name
) {
492 return branch
->remote_name
;
499 const char *pushremote_for_branch(struct branch
*branch
, int *explicit)
501 if (branch
&& branch
->pushremote_name
) {
504 return branch
->pushremote_name
;
506 if (pushremote_name
) {
509 return pushremote_name
;
511 return remote_for_branch(branch
, explicit);
514 const char *remote_ref_for_branch(struct branch
*branch
, int for_push
,
519 if (branch
->merge_nr
) {
522 return branch
->merge_name
[0];
525 const char *dst
, *remote_name
=
526 pushremote_for_branch(branch
, NULL
);
527 struct remote
*remote
= remote_get(remote_name
);
529 if (remote
&& remote
->push
.nr
&&
530 (dst
= apply_refspecs(&remote
->push
,
543 static struct remote
*remote_get_1(const char *name
,
544 const char *(*get_default
)(struct branch
*, int *))
554 name
= get_default(current_branch
, &name_given
);
556 ret
= make_remote(name
, 0);
557 if (valid_remote_nick(name
) && have_git_dir()) {
558 if (!valid_remote(ret
))
559 read_remotes_file(ret
);
560 if (!valid_remote(ret
))
561 read_branches_file(ret
);
563 if (name_given
&& !valid_remote(ret
))
564 add_url_alias(ret
, name
);
565 if (!valid_remote(ret
))
570 struct remote
*remote_get(const char *name
)
572 return remote_get_1(name
, remote_for_branch
);
575 struct remote
*pushremote_get(const char *name
)
577 return remote_get_1(name
, pushremote_for_branch
);
580 int remote_is_configured(struct remote
*remote
, int in_repo
)
585 return remote
->configured_in_repo
;
586 return !!remote
->origin
;
589 int for_each_remote(each_remote_fn fn
, void *priv
)
593 for (i
= 0; i
< remotes_nr
&& !result
; i
++) {
594 struct remote
*r
= remotes
[i
];
597 result
= fn(r
, priv
);
602 static void handle_duplicate(struct ref
*ref1
, struct ref
*ref2
)
604 if (strcmp(ref1
->name
, ref2
->name
)) {
605 if (ref1
->fetch_head_status
!= FETCH_HEAD_IGNORE
&&
606 ref2
->fetch_head_status
!= FETCH_HEAD_IGNORE
) {
607 die(_("Cannot fetch both %s and %s to %s"),
608 ref1
->name
, ref2
->name
, ref2
->peer_ref
->name
);
609 } else if (ref1
->fetch_head_status
!= FETCH_HEAD_IGNORE
&&
610 ref2
->fetch_head_status
== FETCH_HEAD_IGNORE
) {
611 warning(_("%s usually tracks %s, not %s"),
612 ref2
->peer_ref
->name
, ref2
->name
, ref1
->name
);
613 } else if (ref1
->fetch_head_status
== FETCH_HEAD_IGNORE
&&
614 ref2
->fetch_head_status
== FETCH_HEAD_IGNORE
) {
615 die(_("%s tracks both %s and %s"),
616 ref2
->peer_ref
->name
, ref1
->name
, ref2
->name
);
619 * This last possibility doesn't occur because
620 * FETCH_HEAD_IGNORE entries always appear at
621 * the end of the list.
623 die(_("Internal error"));
626 free(ref2
->peer_ref
);
630 struct ref
*ref_remove_duplicates(struct ref
*ref_map
)
632 struct string_list refs
= STRING_LIST_INIT_NODUP
;
633 struct ref
*retval
= NULL
;
634 struct ref
**p
= &retval
;
637 struct ref
*ref
= ref_map
;
639 ref_map
= ref_map
->next
;
642 if (!ref
->peer_ref
) {
646 struct string_list_item
*item
=
647 string_list_insert(&refs
, ref
->peer_ref
->name
);
650 /* Entry already existed */
651 handle_duplicate((struct ref
*)item
->util
, ref
);
660 string_list_clear(&refs
, 0);
664 int remote_has_url(struct remote
*remote
, const char *url
)
667 for (i
= 0; i
< remote
->url_nr
; i
++) {
668 if (!strcmp(remote
->url
[i
], url
))
674 static int match_name_with_pattern(const char *key
, const char *name
,
675 const char *value
, char **result
)
677 const char *kstar
= strchr(key
, '*');
683 die("Key '%s' of pattern had no '*'", key
);
685 ksuffixlen
= strlen(kstar
+ 1);
686 namelen
= strlen(name
);
687 ret
= !strncmp(name
, key
, klen
) && namelen
>= klen
+ ksuffixlen
&&
688 !memcmp(name
+ namelen
- ksuffixlen
, kstar
+ 1, ksuffixlen
);
690 struct strbuf sb
= STRBUF_INIT
;
691 const char *vstar
= strchr(value
, '*');
693 die("Value '%s' of pattern has no '*'", value
);
694 strbuf_add(&sb
, value
, vstar
- value
);
695 strbuf_add(&sb
, name
+ klen
, namelen
- klen
- ksuffixlen
);
696 strbuf_addstr(&sb
, vstar
+ 1);
697 *result
= strbuf_detach(&sb
, NULL
);
702 static void query_refspecs_multiple(struct refspec
*rs
,
703 struct refspec_item
*query
,
704 struct string_list
*results
)
707 int find_src
= !query
->src
;
709 if (find_src
&& !query
->dst
)
710 error(_("query_refspecs_multiple: need either src or dst"));
712 for (i
= 0; i
< rs
->nr
; i
++) {
713 struct refspec_item
*refspec
= &rs
->items
[i
];
714 const char *key
= find_src
? refspec
->dst
: refspec
->src
;
715 const char *value
= find_src
? refspec
->src
: refspec
->dst
;
716 const char *needle
= find_src
? query
->dst
: query
->src
;
717 char **result
= find_src
? &query
->src
: &query
->dst
;
721 if (refspec
->pattern
) {
722 if (match_name_with_pattern(key
, needle
, value
, result
))
723 string_list_append_nodup(results
, *result
);
724 } else if (!strcmp(needle
, key
)) {
725 string_list_append(results
, value
);
730 int query_refspecs(struct refspec
*rs
, struct refspec_item
*query
)
733 int find_src
= !query
->src
;
734 const char *needle
= find_src
? query
->dst
: query
->src
;
735 char **result
= find_src
? &query
->src
: &query
->dst
;
737 if (find_src
&& !query
->dst
)
738 return error(_("query_refspecs: need either src or dst"));
740 for (i
= 0; i
< rs
->nr
; i
++) {
741 struct refspec_item
*refspec
= &rs
->items
[i
];
742 const char *key
= find_src
? refspec
->dst
: refspec
->src
;
743 const char *value
= find_src
? refspec
->src
: refspec
->dst
;
747 if (refspec
->pattern
) {
748 if (match_name_with_pattern(key
, needle
, value
, result
)) {
749 query
->force
= refspec
->force
;
752 } else if (!strcmp(needle
, key
)) {
753 *result
= xstrdup(value
);
754 query
->force
= refspec
->force
;
761 char *apply_refspecs(struct refspec
*rs
, const char *name
)
763 struct refspec_item query
;
765 memset(&query
, 0, sizeof(struct refspec_item
));
766 query
.src
= (char *)name
;
768 if (query_refspecs(rs
, &query
))
774 int remote_find_tracking(struct remote
*remote
, struct refspec_item
*refspec
)
776 return query_refspecs(&remote
->fetch
, refspec
);
779 static struct ref
*alloc_ref_with_prefix(const char *prefix
, size_t prefixlen
,
782 size_t len
= strlen(name
);
783 struct ref
*ref
= xcalloc(1, st_add4(sizeof(*ref
), prefixlen
, len
, 1));
784 memcpy(ref
->name
, prefix
, prefixlen
);
785 memcpy(ref
->name
+ prefixlen
, name
, len
);
789 struct ref
*alloc_ref(const char *name
)
791 return alloc_ref_with_prefix("", 0, name
);
794 struct ref
*copy_ref(const struct ref
*ref
)
800 len
= st_add3(sizeof(struct ref
), strlen(ref
->name
), 1);
802 memcpy(cpy
, ref
, len
);
804 cpy
->symref
= xstrdup_or_null(ref
->symref
);
805 cpy
->remote_status
= xstrdup_or_null(ref
->remote_status
);
806 cpy
->peer_ref
= copy_ref(ref
->peer_ref
);
810 struct ref
*copy_ref_list(const struct ref
*ref
)
812 struct ref
*ret
= NULL
;
813 struct ref
**tail
= &ret
;
815 *tail
= copy_ref(ref
);
817 tail
= &((*tail
)->next
);
822 static void free_ref(struct ref
*ref
)
826 free_ref(ref
->peer_ref
);
827 free(ref
->remote_status
);
832 void free_refs(struct ref
*ref
)
842 int ref_compare_name(const void *va
, const void *vb
)
844 const struct ref
*a
= va
, *b
= vb
;
845 return strcmp(a
->name
, b
->name
);
848 static void *ref_list_get_next(const void *a
)
850 return ((const struct ref
*)a
)->next
;
853 static void ref_list_set_next(void *a
, void *next
)
855 ((struct ref
*)a
)->next
= next
;
858 void sort_ref_list(struct ref
**l
, int (*cmp
)(const void *, const void *))
860 *l
= llist_mergesort(*l
, ref_list_get_next
, ref_list_set_next
, cmp
);
863 int count_refspec_match(const char *pattern
,
865 struct ref
**matched_ref
)
867 int patlen
= strlen(pattern
);
868 struct ref
*matched_weak
= NULL
;
869 struct ref
*matched
= NULL
;
873 for (weak_match
= match
= 0; refs
; refs
= refs
->next
) {
874 char *name
= refs
->name
;
875 int namelen
= strlen(name
);
877 if (!refname_match(pattern
, name
))
880 /* A match is "weak" if it is with refs outside
881 * heads or tags, and did not specify the pattern
882 * in full (e.g. "refs/remotes/origin/master") or at
883 * least from the toplevel (e.g. "remotes/origin/master");
884 * otherwise "git push $URL master" would result in
885 * ambiguity between remotes/origin/master and heads/master
886 * at the remote site.
888 if (namelen
!= patlen
&&
889 patlen
!= namelen
- 5 &&
890 !starts_with(name
, "refs/heads/") &&
891 !starts_with(name
, "refs/tags/")) {
892 /* We want to catch the case where only weak
893 * matches are found and there are multiple
894 * matches, and where more than one strong
895 * matches are found, as ambiguous. One
896 * strong match with zero or more weak matches
897 * are acceptable as a unique match.
909 *matched_ref
= matched_weak
;
914 *matched_ref
= matched
;
919 static void tail_link_ref(struct ref
*ref
, struct ref
***tail
)
927 static struct ref
*alloc_delete_ref(void)
929 struct ref
*ref
= alloc_ref("(delete)");
930 oidclr(&ref
->new_oid
);
934 static int try_explicit_object_name(const char *name
,
937 struct object_id oid
;
941 *match
= alloc_delete_ref();
945 if (get_oid(name
, &oid
))
949 *match
= alloc_ref(name
);
950 oidcpy(&(*match
)->new_oid
, &oid
);
955 static struct ref
*make_linked_ref(const char *name
, struct ref
***tail
)
957 struct ref
*ret
= alloc_ref(name
);
958 tail_link_ref(ret
, tail
);
962 static char *guess_ref(const char *name
, struct ref
*peer
)
964 struct strbuf buf
= STRBUF_INIT
;
966 const char *r
= resolve_ref_unsafe(peer
->name
, RESOLVE_REF_READING
,
971 if (starts_with(r
, "refs/heads/")) {
972 strbuf_addstr(&buf
, "refs/heads/");
973 } else if (starts_with(r
, "refs/tags/")) {
974 strbuf_addstr(&buf
, "refs/tags/");
979 strbuf_addstr(&buf
, name
);
980 return strbuf_detach(&buf
, NULL
);
983 static int match_explicit_lhs(struct ref
*src
,
984 struct refspec_item
*rs
,
986 int *allocated_match
)
988 switch (count_refspec_match(rs
->src
, src
, match
)) {
991 *allocated_match
= 0;
994 /* The source could be in the get_sha1() format
995 * not a reference name. :refs/other is a
996 * way to delete 'other' ref at the remote end.
998 if (try_explicit_object_name(rs
->src
, match
) < 0)
999 return error(_("src refspec %s does not match any."), rs
->src
);
1000 if (allocated_match
)
1001 *allocated_match
= 1;
1004 return error(_("src refspec %s matches more than one."), rs
->src
);
1008 static int match_explicit(struct ref
*src
, struct ref
*dst
,
1009 struct ref
***dst_tail
,
1010 struct refspec_item
*rs
)
1012 struct ref
*matched_src
, *matched_dst
;
1015 const char *dst_value
= rs
->dst
;
1018 if (rs
->pattern
|| rs
->matching
)
1021 matched_src
= matched_dst
= NULL
;
1022 if (match_explicit_lhs(src
, rs
, &matched_src
, &allocated_src
) < 0)
1028 dst_value
= resolve_ref_unsafe(matched_src
->name
,
1029 RESOLVE_REF_READING
,
1032 ((flag
& REF_ISSYMREF
) &&
1033 !starts_with(dst_value
, "refs/heads/")))
1034 die("%s cannot be resolved to branch.",
1038 switch (count_refspec_match(dst_value
, dst
, &matched_dst
)) {
1042 if (starts_with(dst_value
, "refs/")) {
1043 matched_dst
= make_linked_ref(dst_value
, dst_tail
);
1045 } else if (is_null_oid(&matched_src
->new_oid
)) {
1046 error(_("unable to delete '%s': remote ref does not exist"),
1048 } else if ((dst_guess
= guess_ref(dst_value
, matched_src
))) {
1049 matched_dst
= make_linked_ref(dst_guess
, dst_tail
);
1053 * TRANSLATORS: "matches '%s'%" is the <dst>
1054 * part of "git push <remote> <src>:<dst>"
1055 * push, and "being pushed ('%s')" is the
1058 error(_("The destination you provided is not a full refname (i.e.,\n"
1059 "starting with \"refs/\"). We tried to guess what you meant by:\n"
1061 "- Looking for a ref that matches '%s' on the remote side.\n"
1062 "- Checking if the <src> being pushed ('%s')\n"
1063 " is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
1064 " refs/{heads,tags}/ prefix on the remote side.\n"
1066 "Neither worked, so we gave up. You must fully qualify the ref."),
1067 dst_value
, matched_src
->name
);
1072 error(_("dst refspec %s matches more than one."),
1078 if (matched_dst
->peer_ref
)
1079 return error(_("dst ref %s receives from more than one src."),
1082 matched_dst
->peer_ref
= allocated_src
?
1084 copy_ref(matched_src
);
1085 matched_dst
->force
= rs
->force
;
1090 static int match_explicit_refs(struct ref
*src
, struct ref
*dst
,
1091 struct ref
***dst_tail
, struct refspec
*rs
)
1094 for (i
= errs
= 0; i
< rs
->nr
; i
++)
1095 errs
+= match_explicit(src
, dst
, dst_tail
, &rs
->items
[i
]);
1099 static char *get_ref_match(const struct refspec
*rs
, const struct ref
*ref
,
1100 int send_mirror
, int direction
,
1101 const struct refspec_item
**ret_pat
)
1103 const struct refspec_item
*pat
;
1106 int matching_refs
= -1;
1107 for (i
= 0; i
< rs
->nr
; i
++) {
1108 const struct refspec_item
*item
= &rs
->items
[i
];
1109 if (item
->matching
&&
1110 (matching_refs
== -1 || item
->force
)) {
1115 if (item
->pattern
) {
1116 const char *dst_side
= item
->dst
? item
->dst
: item
->src
;
1118 if (direction
== FROM_SRC
)
1119 match
= match_name_with_pattern(item
->src
, ref
->name
, dst_side
, &name
);
1121 match
= match_name_with_pattern(dst_side
, ref
->name
, item
->src
, &name
);
1128 if (matching_refs
== -1)
1131 pat
= &rs
->items
[matching_refs
];
1132 if (pat
->matching
) {
1134 * "matching refs"; traditionally we pushed everything
1135 * including refs outside refs/heads/ hierarchy, but
1136 * that does not make much sense these days.
1138 if (!send_mirror
&& !starts_with(ref
->name
, "refs/heads/"))
1140 name
= xstrdup(ref
->name
);
1147 static struct ref
**tail_ref(struct ref
**head
)
1149 struct ref
**tail
= head
;
1151 tail
= &((*tail
)->next
);
1156 struct commit
**tip
;
1160 static void add_to_tips(struct tips
*tips
, const struct object_id
*oid
)
1162 struct commit
*commit
;
1164 if (is_null_oid(oid
))
1166 commit
= lookup_commit_reference_gently(the_repository
, oid
, 1);
1167 if (!commit
|| (commit
->object
.flags
& TMP_MARK
))
1169 commit
->object
.flags
|= TMP_MARK
;
1170 ALLOC_GROW(tips
->tip
, tips
->nr
+ 1, tips
->alloc
);
1171 tips
->tip
[tips
->nr
++] = commit
;
1174 static void add_missing_tags(struct ref
*src
, struct ref
**dst
, struct ref
***dst_tail
)
1176 struct string_list dst_tag
= STRING_LIST_INIT_NODUP
;
1177 struct string_list src_tag
= STRING_LIST_INIT_NODUP
;
1178 struct string_list_item
*item
;
1180 struct tips sent_tips
;
1183 * Collect everything we know they would have at the end of
1184 * this push, and collect all tags they have.
1186 memset(&sent_tips
, 0, sizeof(sent_tips
));
1187 for (ref
= *dst
; ref
; ref
= ref
->next
) {
1188 if (ref
->peer_ref
&&
1189 !is_null_oid(&ref
->peer_ref
->new_oid
))
1190 add_to_tips(&sent_tips
, &ref
->peer_ref
->new_oid
);
1192 add_to_tips(&sent_tips
, &ref
->old_oid
);
1193 if (starts_with(ref
->name
, "refs/tags/"))
1194 string_list_append(&dst_tag
, ref
->name
);
1196 clear_commit_marks_many(sent_tips
.nr
, sent_tips
.tip
, TMP_MARK
);
1198 string_list_sort(&dst_tag
);
1200 /* Collect tags they do not have. */
1201 for (ref
= src
; ref
; ref
= ref
->next
) {
1202 if (!starts_with(ref
->name
, "refs/tags/"))
1203 continue; /* not a tag */
1204 if (string_list_has_string(&dst_tag
, ref
->name
))
1205 continue; /* they already have it */
1206 if (oid_object_info(the_repository
, &ref
->new_oid
, NULL
) != OBJ_TAG
)
1207 continue; /* be conservative */
1208 item
= string_list_append(&src_tag
, ref
->name
);
1211 string_list_clear(&dst_tag
, 0);
1214 * At this point, src_tag lists tags that are missing from
1215 * dst, and sent_tips lists the tips we are pushing or those
1216 * that we know they already have. An element in the src_tag
1217 * that is an ancestor of any of the sent_tips needs to be
1218 * sent to the other side.
1221 const int reachable_flag
= 1;
1222 struct commit_list
*found_commits
;
1223 struct commit
**src_commits
;
1224 int nr_src_commits
= 0, alloc_src_commits
= 16;
1225 ALLOC_ARRAY(src_commits
, alloc_src_commits
);
1227 for_each_string_list_item(item
, &src_tag
) {
1228 struct ref
*ref
= item
->util
;
1229 struct commit
*commit
;
1231 if (is_null_oid(&ref
->new_oid
))
1233 commit
= lookup_commit_reference_gently(the_repository
,
1237 /* not pushing a commit, which is not an error */
1240 ALLOC_GROW(src_commits
, nr_src_commits
+ 1, alloc_src_commits
);
1241 src_commits
[nr_src_commits
++] = commit
;
1244 found_commits
= get_reachable_subset(sent_tips
.tip
, sent_tips
.nr
,
1245 src_commits
, nr_src_commits
,
1248 for_each_string_list_item(item
, &src_tag
) {
1249 struct ref
*dst_ref
;
1250 struct ref
*ref
= item
->util
;
1251 struct commit
*commit
;
1253 if (is_null_oid(&ref
->new_oid
))
1255 commit
= lookup_commit_reference_gently(the_repository
,
1259 /* not pushing a commit, which is not an error */
1263 * Is this tag, which they do not have, reachable from
1264 * any of the commits we are sending?
1266 if (!(commit
->object
.flags
& reachable_flag
))
1270 dst_ref
= make_linked_ref(ref
->name
, dst_tail
);
1271 oidcpy(&dst_ref
->new_oid
, &ref
->new_oid
);
1272 dst_ref
->peer_ref
= copy_ref(ref
);
1275 clear_commit_marks_many(nr_src_commits
, src_commits
, reachable_flag
);
1277 free_commit_list(found_commits
);
1280 string_list_clear(&src_tag
, 0);
1281 free(sent_tips
.tip
);
1284 struct ref
*find_ref_by_name(const struct ref
*list
, const char *name
)
1286 for ( ; list
; list
= list
->next
)
1287 if (!strcmp(list
->name
, name
))
1288 return (struct ref
*)list
;
1292 static void prepare_ref_index(struct string_list
*ref_index
, struct ref
*ref
)
1294 for ( ; ref
; ref
= ref
->next
)
1295 string_list_append_nodup(ref_index
, ref
->name
)->util
= ref
;
1297 string_list_sort(ref_index
);
1301 * Given only the set of local refs, sanity-check the set of push
1302 * refspecs. We can't catch all errors that match_push_refs would,
1303 * but we can catch some errors early before even talking to the
1306 int check_push_refs(struct ref
*src
, struct refspec
*rs
)
1311 for (i
= 0; i
< rs
->nr
; i
++) {
1312 struct refspec_item
*item
= &rs
->items
[i
];
1314 if (item
->pattern
|| item
->matching
)
1317 ret
|= match_explicit_lhs(src
, item
, NULL
, NULL
);
1324 * Given the set of refs the local repository has, the set of refs the
1325 * remote repository has, and the refspec used for push, determine
1326 * what remote refs we will update and with what value by setting
1327 * peer_ref (which object is being pushed) and force (if the push is
1328 * forced) in elements of "dst". The function may add new elements to
1329 * dst (e.g. pushing to a new branch, done in match_explicit_refs).
1331 int match_push_refs(struct ref
*src
, struct ref
**dst
,
1332 struct refspec
*rs
, int flags
)
1334 int send_all
= flags
& MATCH_REFS_ALL
;
1335 int send_mirror
= flags
& MATCH_REFS_MIRROR
;
1336 int send_prune
= flags
& MATCH_REFS_PRUNE
;
1338 struct ref
*ref
, **dst_tail
= tail_ref(dst
);
1339 struct string_list dst_ref_index
= STRING_LIST_INIT_NODUP
;
1341 /* If no refspec is provided, use the default ":" */
1343 refspec_append(rs
, ":");
1345 errs
= match_explicit_refs(src
, *dst
, &dst_tail
, rs
);
1347 /* pick the remainder */
1348 for (ref
= src
; ref
; ref
= ref
->next
) {
1349 struct string_list_item
*dst_item
;
1350 struct ref
*dst_peer
;
1351 const struct refspec_item
*pat
= NULL
;
1354 dst_name
= get_ref_match(rs
, ref
, send_mirror
, FROM_SRC
, &pat
);
1358 if (!dst_ref_index
.nr
)
1359 prepare_ref_index(&dst_ref_index
, *dst
);
1361 dst_item
= string_list_lookup(&dst_ref_index
, dst_name
);
1362 dst_peer
= dst_item
? dst_item
->util
: NULL
;
1364 if (dst_peer
->peer_ref
)
1365 /* We're already sending something to this ref. */
1368 if (pat
->matching
&& !(send_all
|| send_mirror
))
1370 * Remote doesn't have it, and we have no
1371 * explicit pattern, and we don't have
1372 * --all or --mirror.
1376 /* Create a new one and link it */
1377 dst_peer
= make_linked_ref(dst_name
, &dst_tail
);
1378 oidcpy(&dst_peer
->new_oid
, &ref
->new_oid
);
1379 string_list_insert(&dst_ref_index
,
1380 dst_peer
->name
)->util
= dst_peer
;
1382 dst_peer
->peer_ref
= copy_ref(ref
);
1383 dst_peer
->force
= pat
->force
;
1388 string_list_clear(&dst_ref_index
, 0);
1390 if (flags
& MATCH_REFS_FOLLOW_TAGS
)
1391 add_missing_tags(src
, dst
, &dst_tail
);
1394 struct string_list src_ref_index
= STRING_LIST_INIT_NODUP
;
1395 /* check for missing refs on the remote */
1396 for (ref
= *dst
; ref
; ref
= ref
->next
) {
1400 /* We're already sending something to this ref. */
1403 src_name
= get_ref_match(rs
, ref
, send_mirror
, FROM_DST
, NULL
);
1405 if (!src_ref_index
.nr
)
1406 prepare_ref_index(&src_ref_index
, src
);
1407 if (!string_list_has_string(&src_ref_index
,
1409 ref
->peer_ref
= alloc_delete_ref();
1413 string_list_clear(&src_ref_index
, 0);
1421 void set_ref_status_for_push(struct ref
*remote_refs
, int send_mirror
,
1426 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
1427 int force_ref_update
= ref
->force
|| force_update
;
1428 int reject_reason
= 0;
1431 oidcpy(&ref
->new_oid
, &ref
->peer_ref
->new_oid
);
1432 else if (!send_mirror
)
1435 ref
->deletion
= is_null_oid(&ref
->new_oid
);
1436 if (!ref
->deletion
&&
1437 oideq(&ref
->old_oid
, &ref
->new_oid
)) {
1438 ref
->status
= REF_STATUS_UPTODATE
;
1443 * If the remote ref has moved and is now different
1444 * from what we expect, reject any push.
1446 * It also is an error if the user told us to check
1447 * with the remote-tracking branch to find the value
1448 * to expect, but we did not have such a tracking
1451 if (ref
->expect_old_sha1
) {
1452 if (!oideq(&ref
->old_oid
, &ref
->old_oid_expect
))
1453 reject_reason
= REF_STATUS_REJECT_STALE
;
1455 /* If the ref isn't stale then force the update. */
1456 force_ref_update
= 1;
1460 * If the update isn't already rejected then check
1461 * the usual "must fast-forward" rules.
1463 * Decide whether an individual refspec A:B can be
1464 * pushed. The push will succeed if any of the
1465 * following are true:
1467 * (1) the remote reference B does not exist
1469 * (2) the remote reference B is being removed (i.e.,
1470 * pushing :B where no source is specified)
1472 * (3) the destination is not under refs/tags/, and
1473 * if the old and new value is a commit, the new
1474 * is a descendant of the old.
1476 * (4) it is forced using the +A:B notation, or by
1477 * passing the --force argument
1480 if (!reject_reason
&& !ref
->deletion
&& !is_null_oid(&ref
->old_oid
)) {
1481 if (starts_with(ref
->name
, "refs/tags/"))
1482 reject_reason
= REF_STATUS_REJECT_ALREADY_EXISTS
;
1483 else if (!has_object_file(&ref
->old_oid
))
1484 reject_reason
= REF_STATUS_REJECT_FETCH_FIRST
;
1485 else if (!lookup_commit_reference_gently(the_repository
, &ref
->old_oid
, 1) ||
1486 !lookup_commit_reference_gently(the_repository
, &ref
->new_oid
, 1))
1487 reject_reason
= REF_STATUS_REJECT_NEEDS_FORCE
;
1488 else if (!ref_newer(&ref
->new_oid
, &ref
->old_oid
))
1489 reject_reason
= REF_STATUS_REJECT_NONFASTFORWARD
;
1493 * "--force" will defeat any rejection implemented
1494 * by the rules above.
1496 if (!force_ref_update
)
1497 ref
->status
= reject_reason
;
1498 else if (reject_reason
)
1499 ref
->forced_update
= 1;
1503 static void set_merge(struct branch
*ret
)
1505 struct remote
*remote
;
1507 struct object_id oid
;
1511 return; /* no branch */
1513 return; /* already run */
1514 if (!ret
->remote_name
|| !ret
->merge_nr
) {
1516 * no merge config; let's make sure we don't confuse callers
1517 * with a non-zero merge_nr but a NULL merge
1523 remote
= remote_get(ret
->remote_name
);
1525 ret
->merge
= xcalloc(ret
->merge_nr
, sizeof(*ret
->merge
));
1526 for (i
= 0; i
< ret
->merge_nr
; i
++) {
1527 ret
->merge
[i
] = xcalloc(1, sizeof(**ret
->merge
));
1528 ret
->merge
[i
]->src
= xstrdup(ret
->merge_name
[i
]);
1529 if (!remote_find_tracking(remote
, ret
->merge
[i
]) ||
1530 strcmp(ret
->remote_name
, "."))
1532 if (dwim_ref(ret
->merge_name
[i
], strlen(ret
->merge_name
[i
]),
1534 ret
->merge
[i
]->dst
= ref
;
1536 ret
->merge
[i
]->dst
= xstrdup(ret
->merge_name
[i
]);
1540 struct branch
*branch_get(const char *name
)
1545 if (!name
|| !*name
|| !strcmp(name
, "HEAD"))
1546 ret
= current_branch
;
1548 ret
= make_branch(name
, 0);
1553 int branch_has_merge_config(struct branch
*branch
)
1555 return branch
&& !!branch
->merge
;
1558 int branch_merge_matches(struct branch
*branch
,
1560 const char *refname
)
1562 if (!branch
|| i
< 0 || i
>= branch
->merge_nr
)
1564 return refname_match(branch
->merge
[i
]->src
, refname
);
1567 __attribute__((format (printf
,2,3)))
1568 static const char *error_buf(struct strbuf
*err
, const char *fmt
, ...)
1573 strbuf_vaddf(err
, fmt
, ap
);
1579 const char *branch_get_upstream(struct branch
*branch
, struct strbuf
*err
)
1582 return error_buf(err
, _("HEAD does not point to a branch"));
1584 if (!branch
->merge
|| !branch
->merge
[0]) {
1586 * no merge config; is it because the user didn't define any,
1587 * or because it is not a real branch, and get_branch
1590 if (!ref_exists(branch
->refname
))
1591 return error_buf(err
, _("no such branch: '%s'"),
1593 return error_buf(err
,
1594 _("no upstream configured for branch '%s'"),
1598 if (!branch
->merge
[0]->dst
)
1599 return error_buf(err
,
1600 _("upstream branch '%s' not stored as a remote-tracking branch"),
1601 branch
->merge
[0]->src
);
1603 return branch
->merge
[0]->dst
;
1606 static const char *tracking_for_push_dest(struct remote
*remote
,
1607 const char *refname
,
1612 ret
= apply_refspecs(&remote
->fetch
, refname
);
1614 return error_buf(err
,
1615 _("push destination '%s' on remote '%s' has no local tracking branch"),
1616 refname
, remote
->name
);
1620 static const char *branch_get_push_1(struct branch
*branch
, struct strbuf
*err
)
1622 struct remote
*remote
;
1624 remote
= remote_get(pushremote_for_branch(branch
, NULL
));
1626 return error_buf(err
,
1627 _("branch '%s' has no remote for pushing"),
1630 if (remote
->push
.nr
) {
1634 dst
= apply_refspecs(&remote
->push
, branch
->refname
);
1636 return error_buf(err
,
1637 _("push refspecs for '%s' do not include '%s'"),
1638 remote
->name
, branch
->name
);
1640 ret
= tracking_for_push_dest(remote
, dst
, err
);
1646 return tracking_for_push_dest(remote
, branch
->refname
, err
);
1648 switch (push_default
) {
1649 case PUSH_DEFAULT_NOTHING
:
1650 return error_buf(err
, _("push has no destination (push.default is 'nothing')"));
1652 case PUSH_DEFAULT_MATCHING
:
1653 case PUSH_DEFAULT_CURRENT
:
1654 return tracking_for_push_dest(remote
, branch
->refname
, err
);
1656 case PUSH_DEFAULT_UPSTREAM
:
1657 return branch_get_upstream(branch
, err
);
1659 case PUSH_DEFAULT_UNSPECIFIED
:
1660 case PUSH_DEFAULT_SIMPLE
:
1662 const char *up
, *cur
;
1664 up
= branch_get_upstream(branch
, err
);
1667 cur
= tracking_for_push_dest(remote
, branch
->refname
, err
);
1670 if (strcmp(cur
, up
))
1671 return error_buf(err
,
1672 _("cannot resolve 'simple' push to a single destination"));
1677 BUG("unhandled push situation");
1680 const char *branch_get_push(struct branch
*branch
, struct strbuf
*err
)
1683 return error_buf(err
, _("HEAD does not point to a branch"));
1685 if (!branch
->push_tracking_ref
)
1686 branch
->push_tracking_ref
= branch_get_push_1(branch
, err
);
1687 return branch
->push_tracking_ref
;
1690 static int ignore_symref_update(const char *refname
)
1694 if (!resolve_ref_unsafe(refname
, 0, NULL
, &flag
))
1695 return 0; /* non-existing refs are OK */
1696 return (flag
& REF_ISSYMREF
);
1700 * Create and return a list of (struct ref) consisting of copies of
1701 * each remote_ref that matches refspec. refspec must be a pattern.
1702 * Fill in the copies' peer_ref to describe the local tracking refs to
1703 * which they map. Omit any references that would map to an existing
1704 * local symbolic ref.
1706 static struct ref
*get_expanded_map(const struct ref
*remote_refs
,
1707 const struct refspec_item
*refspec
)
1709 const struct ref
*ref
;
1710 struct ref
*ret
= NULL
;
1711 struct ref
**tail
= &ret
;
1713 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
1714 char *expn_name
= NULL
;
1716 if (strchr(ref
->name
, '^'))
1717 continue; /* a dereference item */
1718 if (match_name_with_pattern(refspec
->src
, ref
->name
,
1719 refspec
->dst
, &expn_name
) &&
1720 !ignore_symref_update(expn_name
)) {
1721 struct ref
*cpy
= copy_ref(ref
);
1723 cpy
->peer_ref
= alloc_ref(expn_name
);
1725 cpy
->peer_ref
->force
= 1;
1735 static const struct ref
*find_ref_by_name_abbrev(const struct ref
*refs
, const char *name
)
1737 const struct ref
*ref
;
1738 const struct ref
*best_match
= NULL
;
1741 for (ref
= refs
; ref
; ref
= ref
->next
) {
1742 int score
= refname_match(name
, ref
->name
);
1744 if (best_score
< score
) {
1752 struct ref
*get_remote_ref(const struct ref
*remote_refs
, const char *name
)
1754 const struct ref
*ref
= find_ref_by_name_abbrev(remote_refs
, name
);
1759 return copy_ref(ref
);
1762 static struct ref
*get_local_ref(const char *name
)
1764 if (!name
|| name
[0] == '\0')
1767 if (starts_with(name
, "refs/"))
1768 return alloc_ref(name
);
1770 if (starts_with(name
, "heads/") ||
1771 starts_with(name
, "tags/") ||
1772 starts_with(name
, "remotes/"))
1773 return alloc_ref_with_prefix("refs/", 5, name
);
1775 return alloc_ref_with_prefix("refs/heads/", 11, name
);
1778 int get_fetch_map(const struct ref
*remote_refs
,
1779 const struct refspec_item
*refspec
,
1783 struct ref
*ref_map
, **rmp
;
1785 if (refspec
->pattern
) {
1786 ref_map
= get_expanded_map(remote_refs
, refspec
);
1788 const char *name
= refspec
->src
[0] ? refspec
->src
: "HEAD";
1790 if (refspec
->exact_sha1
) {
1791 ref_map
= alloc_ref(name
);
1792 get_oid_hex(name
, &ref_map
->old_oid
);
1793 ref_map
->exact_oid
= 1;
1795 ref_map
= get_remote_ref(remote_refs
, name
);
1797 if (!missing_ok
&& !ref_map
)
1798 die("Couldn't find remote ref %s", name
);
1800 ref_map
->peer_ref
= get_local_ref(refspec
->dst
);
1801 if (ref_map
->peer_ref
&& refspec
->force
)
1802 ref_map
->peer_ref
->force
= 1;
1806 for (rmp
= &ref_map
; *rmp
; ) {
1807 if ((*rmp
)->peer_ref
) {
1808 if (!starts_with((*rmp
)->peer_ref
->name
, "refs/") ||
1809 check_refname_format((*rmp
)->peer_ref
->name
, 0)) {
1810 struct ref
*ignore
= *rmp
;
1811 error(_("* Ignoring funny ref '%s' locally"),
1812 (*rmp
)->peer_ref
->name
);
1813 *rmp
= (*rmp
)->next
;
1814 free(ignore
->peer_ref
);
1819 rmp
= &((*rmp
)->next
);
1823 tail_link_ref(ref_map
, tail
);
1828 int resolve_remote_symref(struct ref
*ref
, struct ref
*list
)
1832 for (; list
; list
= list
->next
)
1833 if (!strcmp(ref
->symref
, list
->name
)) {
1834 oidcpy(&ref
->old_oid
, &list
->old_oid
);
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(the_repository
, &oid
);
1879 if (read_ref(branch
->refname
, &oid
))
1881 ours
= lookup_commit_reference(the_repository
, &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 repo_init_revisions(the_repository
, &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
&& oideq(&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 oideq(&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
;
2074 static int get_stale_heads_cb(const char *refname
, const struct object_id
*oid
,
2075 int flags
, void *cb_data
)
2077 struct stale_heads_info
*info
= cb_data
;
2078 struct string_list matches
= STRING_LIST_INIT_DUP
;
2079 struct refspec_item query
;
2081 memset(&query
, 0, sizeof(struct refspec_item
));
2082 query
.dst
= (char *)refname
;
2084 query_refspecs_multiple(info
->rs
, &query
, &matches
);
2085 if (matches
.nr
== 0)
2086 goto clean_exit
; /* No matches */
2089 * If we did find a suitable refspec and it's not a symref and
2090 * it's not in the list of refs that currently exist in that
2091 * remote, we consider it to be stale. In order to deal with
2092 * overlapping refspecs, we need to go over all of the
2095 if (flags
& REF_ISSYMREF
)
2098 for (i
= 0; stale
&& i
< matches
.nr
; i
++)
2099 if (string_list_has_string(info
->ref_names
, matches
.items
[i
].string
))
2103 struct ref
*ref
= make_linked_ref(refname
, &info
->stale_refs_tail
);
2104 oidcpy(&ref
->new_oid
, oid
);
2108 string_list_clear(&matches
, 0);
2112 struct ref
*get_stale_heads(struct refspec
*rs
, struct ref
*fetch_map
)
2114 struct ref
*ref
, *stale_refs
= NULL
;
2115 struct string_list ref_names
= STRING_LIST_INIT_NODUP
;
2116 struct stale_heads_info info
;
2118 info
.ref_names
= &ref_names
;
2119 info
.stale_refs_tail
= &stale_refs
;
2121 for (ref
= fetch_map
; ref
; ref
= ref
->next
)
2122 string_list_append(&ref_names
, ref
->name
);
2123 string_list_sort(&ref_names
);
2124 for_each_ref(get_stale_heads_cb
, &info
);
2125 string_list_clear(&ref_names
, 0);
2132 static void clear_cas_option(struct push_cas_option
*cas
)
2136 for (i
= 0; i
< cas
->nr
; i
++)
2137 free(cas
->entry
[i
].refname
);
2139 memset(cas
, 0, sizeof(*cas
));
2142 static struct push_cas
*add_cas_entry(struct push_cas_option
*cas
,
2143 const char *refname
,
2146 struct push_cas
*entry
;
2147 ALLOC_GROW(cas
->entry
, cas
->nr
+ 1, cas
->alloc
);
2148 entry
= &cas
->entry
[cas
->nr
++];
2149 memset(entry
, 0, sizeof(*entry
));
2150 entry
->refname
= xmemdupz(refname
, refnamelen
);
2154 static int parse_push_cas_option(struct push_cas_option
*cas
, const char *arg
, int unset
)
2157 struct push_cas
*entry
;
2160 /* "--no-<option>" */
2161 clear_cas_option(cas
);
2166 /* just "--<option>" */
2167 cas
->use_tracking_for_rest
= 1;
2171 /* "--<option>=refname" or "--<option>=refname:value" */
2172 colon
= strchrnul(arg
, ':');
2173 entry
= add_cas_entry(cas
, arg
, colon
- arg
);
2175 entry
->use_tracking
= 1;
2177 oidclr(&entry
->expect
);
2178 else if (get_oid(colon
+ 1, &entry
->expect
))
2179 return error(_("cannot parse expected object name '%s'"), colon
+ 1);
2183 int parseopt_push_cas_option(const struct option
*opt
, const char *arg
, int unset
)
2185 return parse_push_cas_option(opt
->value
, arg
, unset
);
2188 int is_empty_cas(const struct push_cas_option
*cas
)
2190 return !cas
->use_tracking_for_rest
&& !cas
->nr
;
2194 * Look at remote.fetch refspec and see if we have a remote
2195 * tracking branch for the refname there. Fill its current
2197 * If we cannot do so, return negative to signal an error.
2199 static int remote_tracking(struct remote
*remote
, const char *refname
,
2200 struct object_id
*oid
)
2204 dst
= apply_refspecs(&remote
->fetch
, refname
);
2206 return -1; /* no tracking ref for refname at remote */
2207 if (read_ref(dst
, oid
))
2208 return -1; /* we know what the tracking ref is but we cannot read it */
2212 static void apply_cas(struct push_cas_option
*cas
,
2213 struct remote
*remote
,
2218 /* Find an explicit --<option>=<name>[:<value>] entry */
2219 for (i
= 0; i
< cas
->nr
; i
++) {
2220 struct push_cas
*entry
= &cas
->entry
[i
];
2221 if (!refname_match(entry
->refname
, ref
->name
))
2223 ref
->expect_old_sha1
= 1;
2224 if (!entry
->use_tracking
)
2225 oidcpy(&ref
->old_oid_expect
, &entry
->expect
);
2226 else if (remote_tracking(remote
, ref
->name
, &ref
->old_oid_expect
))
2227 oidclr(&ref
->old_oid_expect
);
2231 /* Are we using "--<option>" to cover all? */
2232 if (!cas
->use_tracking_for_rest
)
2235 ref
->expect_old_sha1
= 1;
2236 if (remote_tracking(remote
, ref
->name
, &ref
->old_oid_expect
))
2237 oidclr(&ref
->old_oid_expect
);
2240 void apply_push_cas(struct push_cas_option
*cas
,
2241 struct remote
*remote
,
2242 struct ref
*remote_refs
)
2245 for (ref
= remote_refs
; ref
; ref
= ref
->next
)
2246 apply_cas(cas
, remote
, ref
);