10 #include "string-list.h"
11 #include "mergesort.h"
12 #include "argv-array.h"
14 enum map_direction
{ FROM_SRC
, FROM_DST
};
16 static struct refspec s_tag_refspec
= {
25 const struct refspec
*tag_refspec
= &s_tag_refspec
;
27 struct counted_string
{
34 struct counted_string
*instead_of
;
39 struct rewrite
**rewrite
;
44 static struct remote
**remotes
;
45 static int remotes_alloc
;
46 static int remotes_nr
;
47 static struct hashmap remotes_hash
;
49 static struct branch
**branches
;
50 static int branches_alloc
;
51 static int branches_nr
;
53 static struct branch
*current_branch
;
54 static const char *pushremote_name
;
56 static struct rewrites rewrites
;
57 static struct rewrites rewrites_push
;
59 static int valid_remote(const struct remote
*remote
)
61 return (!!remote
->url
) || (!!remote
->foreign_vcs
);
64 static const char *alias_url(const char *url
, struct rewrites
*r
)
67 struct counted_string
*longest
;
72 for (i
= 0; i
< r
->rewrite_nr
; i
++) {
75 for (j
= 0; j
< r
->rewrite
[i
]->instead_of_nr
; j
++) {
76 if (starts_with(url
, r
->rewrite
[i
]->instead_of
[j
].s
) &&
78 longest
->len
< r
->rewrite
[i
]->instead_of
[j
].len
)) {
79 longest
= &(r
->rewrite
[i
]->instead_of
[j
]);
87 return xstrfmt("%s%s", r
->rewrite
[longest_i
]->base
, url
+ longest
->len
);
90 static void add_push_refspec(struct remote
*remote
, const char *ref
)
92 ALLOC_GROW(remote
->push_refspec
,
93 remote
->push_refspec_nr
+ 1,
94 remote
->push_refspec_alloc
);
95 remote
->push_refspec
[remote
->push_refspec_nr
++] = ref
;
98 static void add_fetch_refspec(struct remote
*remote
, const char *ref
)
100 ALLOC_GROW(remote
->fetch_refspec
,
101 remote
->fetch_refspec_nr
+ 1,
102 remote
->fetch_refspec_alloc
);
103 remote
->fetch_refspec
[remote
->fetch_refspec_nr
++] = ref
;
106 static void add_url(struct remote
*remote
, const char *url
)
108 ALLOC_GROW(remote
->url
, remote
->url_nr
+ 1, remote
->url_alloc
);
109 remote
->url
[remote
->url_nr
++] = url
;
112 static void add_pushurl(struct remote
*remote
, const char *pushurl
)
114 ALLOC_GROW(remote
->pushurl
, remote
->pushurl_nr
+ 1, remote
->pushurl_alloc
);
115 remote
->pushurl
[remote
->pushurl_nr
++] = pushurl
;
118 static void add_pushurl_alias(struct remote
*remote
, const char *url
)
120 const char *pushurl
= alias_url(url
, &rewrites_push
);
122 add_pushurl(remote
, pushurl
);
125 static void add_url_alias(struct remote
*remote
, const char *url
)
127 add_url(remote
, alias_url(url
, &rewrites
));
128 add_pushurl_alias(remote
, url
);
131 struct remotes_hash_key
{
136 static int remotes_hash_cmp(const void *unused_cmp_data
,
138 const void *entry_or_key
,
141 const struct remote
*a
= entry
;
142 const struct remote
*b
= entry_or_key
;
143 const struct remotes_hash_key
*key
= keydata
;
146 return strncmp(a
->name
, key
->str
, key
->len
) || a
->name
[key
->len
];
148 return strcmp(a
->name
, b
->name
);
151 static inline void init_remotes_hash(void)
153 if (!remotes_hash
.cmpfn
)
154 hashmap_init(&remotes_hash
, remotes_hash_cmp
, NULL
, 0);
157 static struct remote
*make_remote(const char *name
, int len
)
159 struct remote
*ret
, *replaced
;
160 struct remotes_hash_key lookup
;
161 struct hashmap_entry lookup_entry
;
169 hashmap_entry_init(&lookup_entry
, memhash(name
, len
));
171 if ((ret
= hashmap_get(&remotes_hash
, &lookup_entry
, &lookup
)) != NULL
)
174 ret
= xcalloc(1, sizeof(struct remote
));
175 ret
->prune
= -1; /* unspecified */
176 ALLOC_GROW(remotes
, remotes_nr
+ 1, remotes_alloc
);
177 remotes
[remotes_nr
++] = ret
;
178 ret
->name
= xstrndup(name
, len
);
180 hashmap_entry_init(ret
, lookup_entry
.hash
);
181 replaced
= hashmap_put(&remotes_hash
, ret
);
182 assert(replaced
== NULL
); /* no previous entry overwritten */
186 static void add_merge(struct branch
*branch
, const char *name
)
188 ALLOC_GROW(branch
->merge_name
, branch
->merge_nr
+ 1,
189 branch
->merge_alloc
);
190 branch
->merge_name
[branch
->merge_nr
++] = name
;
193 static struct branch
*make_branch(const char *name
, int len
)
198 for (i
= 0; i
< branches_nr
; i
++) {
199 if (len
? (!strncmp(name
, branches
[i
]->name
, len
) &&
200 !branches
[i
]->name
[len
]) :
201 !strcmp(name
, branches
[i
]->name
))
205 ALLOC_GROW(branches
, branches_nr
+ 1, branches_alloc
);
206 ret
= xcalloc(1, sizeof(struct branch
));
207 branches
[branches_nr
++] = ret
;
209 ret
->name
= xstrndup(name
, len
);
211 ret
->name
= xstrdup(name
);
212 ret
->refname
= xstrfmt("refs/heads/%s", ret
->name
);
217 static struct rewrite
*make_rewrite(struct rewrites
*r
, const char *base
, int len
)
222 for (i
= 0; i
< r
->rewrite_nr
; i
++) {
224 ? (len
== r
->rewrite
[i
]->baselen
&&
225 !strncmp(base
, r
->rewrite
[i
]->base
, len
))
226 : !strcmp(base
, r
->rewrite
[i
]->base
))
227 return r
->rewrite
[i
];
230 ALLOC_GROW(r
->rewrite
, r
->rewrite_nr
+ 1, r
->rewrite_alloc
);
231 ret
= xcalloc(1, sizeof(struct rewrite
));
232 r
->rewrite
[r
->rewrite_nr
++] = ret
;
234 ret
->base
= xstrndup(base
, len
);
238 ret
->base
= xstrdup(base
);
239 ret
->baselen
= strlen(base
);
244 static void add_instead_of(struct rewrite
*rewrite
, const char *instead_of
)
246 ALLOC_GROW(rewrite
->instead_of
, rewrite
->instead_of_nr
+ 1, rewrite
->instead_of_alloc
);
247 rewrite
->instead_of
[rewrite
->instead_of_nr
].s
= instead_of
;
248 rewrite
->instead_of
[rewrite
->instead_of_nr
].len
= strlen(instead_of
);
249 rewrite
->instead_of_nr
++;
252 static const char *skip_spaces(const char *s
)
259 static void read_remotes_file(struct remote
*remote
)
261 struct strbuf buf
= STRBUF_INIT
;
262 FILE *f
= fopen_or_warn(git_path("remotes/%s", remote
->name
), "r");
266 remote
->configured_in_repo
= 1;
267 remote
->origin
= REMOTE_REMOTES
;
268 while (strbuf_getline(&buf
, f
) != EOF
) {
273 if (skip_prefix(buf
.buf
, "URL:", &v
))
274 add_url_alias(remote
, xstrdup(skip_spaces(v
)));
275 else if (skip_prefix(buf
.buf
, "Push:", &v
))
276 add_push_refspec(remote
, xstrdup(skip_spaces(v
)));
277 else if (skip_prefix(buf
.buf
, "Pull:", &v
))
278 add_fetch_refspec(remote
, xstrdup(skip_spaces(v
)));
280 strbuf_release(&buf
);
284 static void read_branches_file(struct remote
*remote
)
287 struct strbuf buf
= STRBUF_INIT
;
288 FILE *f
= fopen_or_warn(git_path("branches/%s", remote
->name
), "r");
293 strbuf_getline_lf(&buf
, f
);
297 strbuf_release(&buf
);
301 remote
->configured_in_repo
= 1;
302 remote
->origin
= REMOTE_BRANCHES
;
305 * The branches file would have URL and optionally
306 * #branch specified. The "master" (or specified) branch is
307 * fetched and stored in the local branch matching the
310 frag
= strchr(buf
.buf
, '#');
316 add_url_alias(remote
, strbuf_detach(&buf
, NULL
));
317 add_fetch_refspec(remote
, xstrfmt("refs/heads/%s:refs/heads/%s",
318 frag
, remote
->name
));
321 * Cogito compatible push: push current HEAD to remote #branch
322 * (master if missing)
324 add_push_refspec(remote
, xstrfmt("HEAD:refs/heads/%s", frag
));
325 remote
->fetch_tags
= 1; /* always auto-follow */
328 static int handle_config(const char *key
, const char *value
, void *cb
)
333 struct remote
*remote
;
334 struct branch
*branch
;
335 if (parse_config_key(key
, "branch", &name
, &namelen
, &subkey
) >= 0) {
338 branch
= make_branch(name
, namelen
);
339 if (!strcmp(subkey
, "remote")) {
340 return git_config_string(&branch
->remote_name
, key
, value
);
341 } else if (!strcmp(subkey
, "pushremote")) {
342 return git_config_string(&branch
->pushremote_name
, key
, value
);
343 } else if (!strcmp(subkey
, "merge")) {
345 return config_error_nonbool(key
);
346 add_merge(branch
, xstrdup(value
));
350 if (parse_config_key(key
, "url", &name
, &namelen
, &subkey
) >= 0) {
351 struct rewrite
*rewrite
;
354 if (!strcmp(subkey
, "insteadof")) {
355 rewrite
= make_rewrite(&rewrites
, name
, namelen
);
357 return config_error_nonbool(key
);
358 add_instead_of(rewrite
, xstrdup(value
));
359 } else if (!strcmp(subkey
, "pushinsteadof")) {
360 rewrite
= make_rewrite(&rewrites_push
, name
, namelen
);
362 return config_error_nonbool(key
);
363 add_instead_of(rewrite
, xstrdup(value
));
367 if (parse_config_key(key
, "remote", &name
, &namelen
, &subkey
) < 0)
370 /* Handle remote.* variables */
371 if (!name
&& !strcmp(subkey
, "pushdefault"))
372 return git_config_string(&pushremote_name
, key
, value
);
376 /* Handle remote.<name>.* variables */
378 warning("Config remote shorthand cannot begin with '/': %s",
382 remote
= make_remote(name
, namelen
);
383 remote
->origin
= REMOTE_CONFIG
;
384 if (current_config_scope() == CONFIG_SCOPE_REPO
)
385 remote
->configured_in_repo
= 1;
386 if (!strcmp(subkey
, "mirror"))
387 remote
->mirror
= git_config_bool(key
, value
);
388 else if (!strcmp(subkey
, "skipdefaultupdate"))
389 remote
->skip_default_update
= git_config_bool(key
, value
);
390 else if (!strcmp(subkey
, "skipfetchall"))
391 remote
->skip_default_update
= git_config_bool(key
, value
);
392 else if (!strcmp(subkey
, "prune"))
393 remote
->prune
= git_config_bool(key
, value
);
394 else if (!strcmp(subkey
, "url")) {
396 if (git_config_string(&v
, key
, value
))
399 } else if (!strcmp(subkey
, "pushurl")) {
401 if (git_config_string(&v
, key
, value
))
403 add_pushurl(remote
, v
);
404 } else if (!strcmp(subkey
, "push")) {
406 if (git_config_string(&v
, key
, value
))
408 add_push_refspec(remote
, v
);
409 } else if (!strcmp(subkey
, "fetch")) {
411 if (git_config_string(&v
, key
, value
))
413 add_fetch_refspec(remote
, v
);
414 } else if (!strcmp(subkey
, "receivepack")) {
416 if (git_config_string(&v
, key
, value
))
418 if (!remote
->receivepack
)
419 remote
->receivepack
= v
;
421 error("more than one receivepack given, using the first");
422 } else if (!strcmp(subkey
, "uploadpack")) {
424 if (git_config_string(&v
, key
, value
))
426 if (!remote
->uploadpack
)
427 remote
->uploadpack
= v
;
429 error("more than one uploadpack given, using the first");
430 } else if (!strcmp(subkey
, "tagopt")) {
431 if (!strcmp(value
, "--no-tags"))
432 remote
->fetch_tags
= -1;
433 else if (!strcmp(value
, "--tags"))
434 remote
->fetch_tags
= 2;
435 } else if (!strcmp(subkey
, "proxy")) {
436 return git_config_string((const char **)&remote
->http_proxy
,
438 } else if (!strcmp(subkey
, "proxyauthmethod")) {
439 return git_config_string((const char **)&remote
->http_proxy_authmethod
,
441 } else if (!strcmp(subkey
, "vcs")) {
442 return git_config_string(&remote
->foreign_vcs
, key
, value
);
447 static void alias_all_urls(void)
450 for (i
= 0; i
< remotes_nr
; i
++) {
451 int add_pushurl_aliases
;
454 for (j
= 0; j
< remotes
[i
]->pushurl_nr
; j
++) {
455 remotes
[i
]->pushurl
[j
] = alias_url(remotes
[i
]->pushurl
[j
], &rewrites
);
457 add_pushurl_aliases
= remotes
[i
]->pushurl_nr
== 0;
458 for (j
= 0; j
< remotes
[i
]->url_nr
; j
++) {
459 if (add_pushurl_aliases
)
460 add_pushurl_alias(remotes
[i
], remotes
[i
]->url
[j
]);
461 remotes
[i
]->url
[j
] = alias_url(remotes
[i
]->url
[j
], &rewrites
);
466 static void read_config(void)
469 struct object_id oid
;
476 current_branch
= NULL
;
477 if (startup_info
->have_repository
) {
478 const char *head_ref
= resolve_ref_unsafe("HEAD", 0, oid
.hash
, &flag
);
479 if (head_ref
&& (flag
& REF_ISSYMREF
) &&
480 skip_prefix(head_ref
, "refs/heads/", &head_ref
)) {
481 current_branch
= make_branch(head_ref
, 0);
484 git_config(handle_config
, NULL
);
488 static struct refspec
*parse_refspec_internal(int nr_refspec
, const char **refspec
, int fetch
, int verify
)
491 struct refspec
*rs
= xcalloc(nr_refspec
, sizeof(*rs
));
493 for (i
= 0; i
< nr_refspec
; i
++) {
496 const char *lhs
, *rhs
;
507 rhs
= strrchr(lhs
, ':');
510 * Before going on, special case ":" (or "+:") as a refspec
511 * for pushing matching refs.
513 if (!fetch
&& rhs
== lhs
&& rhs
[1] == '\0') {
519 size_t rlen
= strlen(++rhs
);
520 is_glob
= (1 <= rlen
&& strchr(rhs
, '*'));
521 rs
[i
].dst
= xstrndup(rhs
, rlen
);
524 llen
= (rhs
? (rhs
- lhs
- 1) : strlen(lhs
));
525 if (1 <= llen
&& memchr(lhs
, '*', llen
)) {
526 if ((rhs
&& !is_glob
) || (!rhs
&& fetch
))
529 } else if (rhs
&& is_glob
) {
533 rs
[i
].pattern
= is_glob
;
534 rs
[i
].src
= xstrndup(lhs
, llen
);
535 flags
= REFNAME_ALLOW_ONELEVEL
| (is_glob
? REFNAME_REFSPEC_PATTERN
: 0);
538 struct object_id unused
;
542 ; /* empty is ok; it means "HEAD" */
543 else if (llen
== GIT_SHA1_HEXSZ
&& !get_oid_hex(rs
[i
].src
, &unused
))
544 rs
[i
].exact_sha1
= 1; /* ok */
545 else if (!check_refname_format(rs
[i
].src
, flags
))
546 ; /* valid looking ref is ok */
551 ; /* missing is ok; it is the same as empty */
552 else if (!*rs
[i
].dst
)
553 ; /* empty is ok; it means "do not store" */
554 else if (!check_refname_format(rs
[i
].dst
, flags
))
555 ; /* valid looking ref is ok */
561 * - empty is allowed; it means delete.
562 * - when wildcarded, it must be a valid looking ref.
563 * - otherwise, it must be an extended SHA-1, but
564 * there is no existing way to validate this.
569 if (check_refname_format(rs
[i
].src
, flags
))
573 ; /* anything goes, for now */
576 * - missing is allowed, but LHS then must be a
578 * - empty is not allowed.
579 * - otherwise it must be a valid looking ref.
582 if (check_refname_format(rs
[i
].src
, flags
))
584 } else if (!*rs
[i
].dst
) {
587 if (check_refname_format(rs
[i
].dst
, flags
))
597 * nr_refspec must be greater than zero and i must be valid
598 * since it is only possible to reach this point from within
599 * the for loop above.
601 free_refspec(i
+1, rs
);
604 die("Invalid refspec '%s'", refspec
[i
]);
607 int valid_fetch_refspec(const char *fetch_refspec_str
)
609 struct refspec
*refspec
;
611 refspec
= parse_refspec_internal(1, &fetch_refspec_str
, 1, 1);
612 free_refspec(1, refspec
);
616 struct refspec
*parse_fetch_refspec(int nr_refspec
, const char **refspec
)
618 return parse_refspec_internal(nr_refspec
, refspec
, 1, 0);
621 struct refspec
*parse_push_refspec(int nr_refspec
, const char **refspec
)
623 return parse_refspec_internal(nr_refspec
, refspec
, 0, 0);
626 void free_refspec(int nr_refspec
, struct refspec
*refspec
)
633 for (i
= 0; i
< nr_refspec
; i
++) {
634 free(refspec
[i
].src
);
635 free(refspec
[i
].dst
);
640 static int valid_remote_nick(const char *name
)
642 if (!name
[0] || is_dot_or_dotdot(name
))
645 /* remote nicknames cannot contain slashes */
647 if (is_dir_sep(*name
++))
652 const char *remote_for_branch(struct branch
*branch
, int *explicit)
654 if (branch
&& branch
->remote_name
) {
657 return branch
->remote_name
;
664 const char *pushremote_for_branch(struct branch
*branch
, int *explicit)
666 if (branch
&& branch
->pushremote_name
) {
669 return branch
->pushremote_name
;
671 if (pushremote_name
) {
674 return pushremote_name
;
676 return remote_for_branch(branch
, explicit);
679 static struct remote
*remote_get_1(const char *name
,
680 const char *(*get_default
)(struct branch
*, int *))
690 name
= get_default(current_branch
, &name_given
);
692 ret
= make_remote(name
, 0);
693 if (valid_remote_nick(name
) && have_git_dir()) {
694 if (!valid_remote(ret
))
695 read_remotes_file(ret
);
696 if (!valid_remote(ret
))
697 read_branches_file(ret
);
699 if (name_given
&& !valid_remote(ret
))
700 add_url_alias(ret
, name
);
701 if (!valid_remote(ret
))
703 ret
->fetch
= parse_fetch_refspec(ret
->fetch_refspec_nr
, ret
->fetch_refspec
);
704 ret
->push
= parse_push_refspec(ret
->push_refspec_nr
, ret
->push_refspec
);
708 struct remote
*remote_get(const char *name
)
710 return remote_get_1(name
, remote_for_branch
);
713 struct remote
*pushremote_get(const char *name
)
715 return remote_get_1(name
, pushremote_for_branch
);
718 int remote_is_configured(struct remote
*remote
, int in_repo
)
723 return remote
->configured_in_repo
;
724 return !!remote
->origin
;
727 int for_each_remote(each_remote_fn fn
, void *priv
)
731 for (i
= 0; i
< remotes_nr
&& !result
; i
++) {
732 struct remote
*r
= remotes
[i
];
736 r
->fetch
= parse_fetch_refspec(r
->fetch_refspec_nr
,
739 r
->push
= parse_push_refspec(r
->push_refspec_nr
,
741 result
= fn(r
, priv
);
746 static void handle_duplicate(struct ref
*ref1
, struct ref
*ref2
)
748 if (strcmp(ref1
->name
, ref2
->name
)) {
749 if (ref1
->fetch_head_status
!= FETCH_HEAD_IGNORE
&&
750 ref2
->fetch_head_status
!= FETCH_HEAD_IGNORE
) {
751 die(_("Cannot fetch both %s and %s to %s"),
752 ref1
->name
, ref2
->name
, ref2
->peer_ref
->name
);
753 } else if (ref1
->fetch_head_status
!= FETCH_HEAD_IGNORE
&&
754 ref2
->fetch_head_status
== FETCH_HEAD_IGNORE
) {
755 warning(_("%s usually tracks %s, not %s"),
756 ref2
->peer_ref
->name
, ref2
->name
, ref1
->name
);
757 } else if (ref1
->fetch_head_status
== FETCH_HEAD_IGNORE
&&
758 ref2
->fetch_head_status
== FETCH_HEAD_IGNORE
) {
759 die(_("%s tracks both %s and %s"),
760 ref2
->peer_ref
->name
, ref1
->name
, ref2
->name
);
763 * This last possibility doesn't occur because
764 * FETCH_HEAD_IGNORE entries always appear at
765 * the end of the list.
767 die(_("Internal error"));
770 free(ref2
->peer_ref
);
774 struct ref
*ref_remove_duplicates(struct ref
*ref_map
)
776 struct string_list refs
= STRING_LIST_INIT_NODUP
;
777 struct ref
*retval
= NULL
;
778 struct ref
**p
= &retval
;
781 struct ref
*ref
= ref_map
;
783 ref_map
= ref_map
->next
;
786 if (!ref
->peer_ref
) {
790 struct string_list_item
*item
=
791 string_list_insert(&refs
, ref
->peer_ref
->name
);
794 /* Entry already existed */
795 handle_duplicate((struct ref
*)item
->util
, ref
);
804 string_list_clear(&refs
, 0);
808 int remote_has_url(struct remote
*remote
, const char *url
)
811 for (i
= 0; i
< remote
->url_nr
; i
++) {
812 if (!strcmp(remote
->url
[i
], url
))
818 static int match_name_with_pattern(const char *key
, const char *name
,
819 const char *value
, char **result
)
821 const char *kstar
= strchr(key
, '*');
827 die("Key '%s' of pattern had no '*'", key
);
829 ksuffixlen
= strlen(kstar
+ 1);
830 namelen
= strlen(name
);
831 ret
= !strncmp(name
, key
, klen
) && namelen
>= klen
+ ksuffixlen
&&
832 !memcmp(name
+ namelen
- ksuffixlen
, kstar
+ 1, ksuffixlen
);
834 struct strbuf sb
= STRBUF_INIT
;
835 const char *vstar
= strchr(value
, '*');
837 die("Value '%s' of pattern has no '*'", value
);
838 strbuf_add(&sb
, value
, vstar
- value
);
839 strbuf_add(&sb
, name
+ klen
, namelen
- klen
- ksuffixlen
);
840 strbuf_addstr(&sb
, vstar
+ 1);
841 *result
= strbuf_detach(&sb
, NULL
);
846 static void query_refspecs_multiple(struct refspec
*refs
, int ref_count
, struct refspec
*query
, struct string_list
*results
)
849 int find_src
= !query
->src
;
851 if (find_src
&& !query
->dst
)
852 error("query_refspecs_multiple: need either src or dst");
854 for (i
= 0; i
< ref_count
; i
++) {
855 struct refspec
*refspec
= &refs
[i
];
856 const char *key
= find_src
? refspec
->dst
: refspec
->src
;
857 const char *value
= find_src
? refspec
->src
: refspec
->dst
;
858 const char *needle
= find_src
? query
->dst
: query
->src
;
859 char **result
= find_src
? &query
->src
: &query
->dst
;
863 if (refspec
->pattern
) {
864 if (match_name_with_pattern(key
, needle
, value
, result
))
865 string_list_append_nodup(results
, *result
);
866 } else if (!strcmp(needle
, key
)) {
867 string_list_append(results
, value
);
872 int query_refspecs(struct refspec
*refs
, int ref_count
, struct refspec
*query
)
875 int find_src
= !query
->src
;
876 const char *needle
= find_src
? query
->dst
: query
->src
;
877 char **result
= find_src
? &query
->src
: &query
->dst
;
879 if (find_src
&& !query
->dst
)
880 return error("query_refspecs: need either src or dst");
882 for (i
= 0; i
< ref_count
; i
++) {
883 struct refspec
*refspec
= &refs
[i
];
884 const char *key
= find_src
? refspec
->dst
: refspec
->src
;
885 const char *value
= find_src
? refspec
->src
: refspec
->dst
;
889 if (refspec
->pattern
) {
890 if (match_name_with_pattern(key
, needle
, value
, result
)) {
891 query
->force
= refspec
->force
;
894 } else if (!strcmp(needle
, key
)) {
895 *result
= xstrdup(value
);
896 query
->force
= refspec
->force
;
903 char *apply_refspecs(struct refspec
*refspecs
, int nr_refspec
,
906 struct refspec query
;
908 memset(&query
, 0, sizeof(struct refspec
));
909 query
.src
= (char *)name
;
911 if (query_refspecs(refspecs
, nr_refspec
, &query
))
917 int remote_find_tracking(struct remote
*remote
, struct refspec
*refspec
)
919 return query_refspecs(remote
->fetch
, remote
->fetch_refspec_nr
, refspec
);
922 static struct ref
*alloc_ref_with_prefix(const char *prefix
, size_t prefixlen
,
925 size_t len
= strlen(name
);
926 struct ref
*ref
= xcalloc(1, st_add4(sizeof(*ref
), prefixlen
, len
, 1));
927 memcpy(ref
->name
, prefix
, prefixlen
);
928 memcpy(ref
->name
+ prefixlen
, name
, len
);
932 struct ref
*alloc_ref(const char *name
)
934 return alloc_ref_with_prefix("", 0, name
);
937 struct ref
*copy_ref(const struct ref
*ref
)
943 len
= st_add3(sizeof(struct ref
), strlen(ref
->name
), 1);
945 memcpy(cpy
, ref
, len
);
947 cpy
->symref
= xstrdup_or_null(ref
->symref
);
948 cpy
->remote_status
= xstrdup_or_null(ref
->remote_status
);
949 cpy
->peer_ref
= copy_ref(ref
->peer_ref
);
953 struct ref
*copy_ref_list(const struct ref
*ref
)
955 struct ref
*ret
= NULL
;
956 struct ref
**tail
= &ret
;
958 *tail
= copy_ref(ref
);
960 tail
= &((*tail
)->next
);
965 static void free_ref(struct ref
*ref
)
969 free_ref(ref
->peer_ref
);
970 free(ref
->remote_status
);
975 void free_refs(struct ref
*ref
)
985 int ref_compare_name(const void *va
, const void *vb
)
987 const struct ref
*a
= va
, *b
= vb
;
988 return strcmp(a
->name
, b
->name
);
991 static void *ref_list_get_next(const void *a
)
993 return ((const struct ref
*)a
)->next
;
996 static void ref_list_set_next(void *a
, void *next
)
998 ((struct ref
*)a
)->next
= next
;
1001 void sort_ref_list(struct ref
**l
, int (*cmp
)(const void *, const void *))
1003 *l
= llist_mergesort(*l
, ref_list_get_next
, ref_list_set_next
, cmp
);
1006 int count_refspec_match(const char *pattern
,
1008 struct ref
**matched_ref
)
1010 int patlen
= strlen(pattern
);
1011 struct ref
*matched_weak
= NULL
;
1012 struct ref
*matched
= NULL
;
1016 for (weak_match
= match
= 0; refs
; refs
= refs
->next
) {
1017 char *name
= refs
->name
;
1018 int namelen
= strlen(name
);
1020 if (!refname_match(pattern
, name
))
1023 /* A match is "weak" if it is with refs outside
1024 * heads or tags, and did not specify the pattern
1025 * in full (e.g. "refs/remotes/origin/master") or at
1026 * least from the toplevel (e.g. "remotes/origin/master");
1027 * otherwise "git push $URL master" would result in
1028 * ambiguity between remotes/origin/master and heads/master
1029 * at the remote site.
1031 if (namelen
!= patlen
&&
1032 patlen
!= namelen
- 5 &&
1033 !starts_with(name
, "refs/heads/") &&
1034 !starts_with(name
, "refs/tags/")) {
1035 /* We want to catch the case where only weak
1036 * matches are found and there are multiple
1037 * matches, and where more than one strong
1038 * matches are found, as ambiguous. One
1039 * strong match with zero or more weak matches
1040 * are acceptable as a unique match.
1042 matched_weak
= refs
;
1052 *matched_ref
= matched_weak
;
1057 *matched_ref
= matched
;
1062 static void tail_link_ref(struct ref
*ref
, struct ref
***tail
)
1070 static struct ref
*alloc_delete_ref(void)
1072 struct ref
*ref
= alloc_ref("(delete)");
1073 oidclr(&ref
->new_oid
);
1077 static int try_explicit_object_name(const char *name
,
1080 struct object_id oid
;
1084 *match
= alloc_delete_ref();
1088 if (get_sha1(name
, oid
.hash
))
1092 *match
= alloc_ref(name
);
1093 oidcpy(&(*match
)->new_oid
, &oid
);
1098 static struct ref
*make_linked_ref(const char *name
, struct ref
***tail
)
1100 struct ref
*ret
= alloc_ref(name
);
1101 tail_link_ref(ret
, tail
);
1105 static char *guess_ref(const char *name
, struct ref
*peer
)
1107 struct strbuf buf
= STRBUF_INIT
;
1108 struct object_id oid
;
1110 const char *r
= resolve_ref_unsafe(peer
->name
, RESOLVE_REF_READING
,
1115 if (starts_with(r
, "refs/heads/"))
1116 strbuf_addstr(&buf
, "refs/heads/");
1117 else if (starts_with(r
, "refs/tags/"))
1118 strbuf_addstr(&buf
, "refs/tags/");
1122 strbuf_addstr(&buf
, name
);
1123 return strbuf_detach(&buf
, NULL
);
1126 static int match_explicit_lhs(struct ref
*src
,
1129 int *allocated_match
)
1131 switch (count_refspec_match(rs
->src
, src
, match
)) {
1133 if (allocated_match
)
1134 *allocated_match
= 0;
1137 /* The source could be in the get_sha1() format
1138 * not a reference name. :refs/other is a
1139 * way to delete 'other' ref at the remote end.
1141 if (try_explicit_object_name(rs
->src
, match
) < 0)
1142 return error("src refspec %s does not match any.", rs
->src
);
1143 if (allocated_match
)
1144 *allocated_match
= 1;
1147 return error("src refspec %s matches more than one.", rs
->src
);
1151 static int match_explicit(struct ref
*src
, struct ref
*dst
,
1152 struct ref
***dst_tail
,
1155 struct ref
*matched_src
, *matched_dst
;
1158 const char *dst_value
= rs
->dst
;
1161 if (rs
->pattern
|| rs
->matching
)
1164 matched_src
= matched_dst
= NULL
;
1165 if (match_explicit_lhs(src
, rs
, &matched_src
, &allocated_src
) < 0)
1169 struct object_id oid
;
1172 dst_value
= resolve_ref_unsafe(matched_src
->name
,
1173 RESOLVE_REF_READING
,
1176 ((flag
& REF_ISSYMREF
) &&
1177 !starts_with(dst_value
, "refs/heads/")))
1178 die("%s cannot be resolved to branch.",
1182 switch (count_refspec_match(dst_value
, dst
, &matched_dst
)) {
1186 if (starts_with(dst_value
, "refs/"))
1187 matched_dst
= make_linked_ref(dst_value
, dst_tail
);
1188 else if (is_null_oid(&matched_src
->new_oid
))
1189 error("unable to delete '%s': remote ref does not exist",
1191 else if ((dst_guess
= guess_ref(dst_value
, matched_src
))) {
1192 matched_dst
= make_linked_ref(dst_guess
, dst_tail
);
1195 error("unable to push to unqualified destination: %s\n"
1196 "The destination refspec neither matches an "
1197 "existing ref on the remote nor\n"
1198 "begins with refs/, and we are unable to "
1199 "guess a prefix based on the source ref.",
1204 error("dst refspec %s matches more than one.",
1210 if (matched_dst
->peer_ref
)
1211 return error("dst ref %s receives from more than one src.",
1214 matched_dst
->peer_ref
= allocated_src
?
1216 copy_ref(matched_src
);
1217 matched_dst
->force
= rs
->force
;
1222 static int match_explicit_refs(struct ref
*src
, struct ref
*dst
,
1223 struct ref
***dst_tail
, struct refspec
*rs
,
1227 for (i
= errs
= 0; i
< rs_nr
; i
++)
1228 errs
+= match_explicit(src
, dst
, dst_tail
, &rs
[i
]);
1232 static char *get_ref_match(const struct refspec
*rs
, int rs_nr
, const struct ref
*ref
,
1233 int send_mirror
, int direction
, const struct refspec
**ret_pat
)
1235 const struct refspec
*pat
;
1238 int matching_refs
= -1;
1239 for (i
= 0; i
< rs_nr
; i
++) {
1240 if (rs
[i
].matching
&&
1241 (matching_refs
== -1 || rs
[i
].force
)) {
1246 if (rs
[i
].pattern
) {
1247 const char *dst_side
= rs
[i
].dst
? rs
[i
].dst
: rs
[i
].src
;
1249 if (direction
== FROM_SRC
)
1250 match
= match_name_with_pattern(rs
[i
].src
, ref
->name
, dst_side
, &name
);
1252 match
= match_name_with_pattern(dst_side
, ref
->name
, rs
[i
].src
, &name
);
1259 if (matching_refs
== -1)
1262 pat
= rs
+ matching_refs
;
1263 if (pat
->matching
) {
1265 * "matching refs"; traditionally we pushed everything
1266 * including refs outside refs/heads/ hierarchy, but
1267 * that does not make much sense these days.
1269 if (!send_mirror
&& !starts_with(ref
->name
, "refs/heads/"))
1271 name
= xstrdup(ref
->name
);
1278 static struct ref
**tail_ref(struct ref
**head
)
1280 struct ref
**tail
= head
;
1282 tail
= &((*tail
)->next
);
1287 struct commit
**tip
;
1291 static void add_to_tips(struct tips
*tips
, const struct object_id
*oid
)
1293 struct commit
*commit
;
1295 if (is_null_oid(oid
))
1297 commit
= lookup_commit_reference_gently(oid
, 1);
1298 if (!commit
|| (commit
->object
.flags
& TMP_MARK
))
1300 commit
->object
.flags
|= TMP_MARK
;
1301 ALLOC_GROW(tips
->tip
, tips
->nr
+ 1, tips
->alloc
);
1302 tips
->tip
[tips
->nr
++] = commit
;
1305 static void add_missing_tags(struct ref
*src
, struct ref
**dst
, struct ref
***dst_tail
)
1307 struct string_list dst_tag
= STRING_LIST_INIT_NODUP
;
1308 struct string_list src_tag
= STRING_LIST_INIT_NODUP
;
1309 struct string_list_item
*item
;
1311 struct tips sent_tips
;
1314 * Collect everything we know they would have at the end of
1315 * this push, and collect all tags they have.
1317 memset(&sent_tips
, 0, sizeof(sent_tips
));
1318 for (ref
= *dst
; ref
; ref
= ref
->next
) {
1319 if (ref
->peer_ref
&&
1320 !is_null_oid(&ref
->peer_ref
->new_oid
))
1321 add_to_tips(&sent_tips
, &ref
->peer_ref
->new_oid
);
1323 add_to_tips(&sent_tips
, &ref
->old_oid
);
1324 if (starts_with(ref
->name
, "refs/tags/"))
1325 string_list_append(&dst_tag
, ref
->name
);
1327 clear_commit_marks_many(sent_tips
.nr
, sent_tips
.tip
, TMP_MARK
);
1329 string_list_sort(&dst_tag
);
1331 /* Collect tags they do not have. */
1332 for (ref
= src
; ref
; ref
= ref
->next
) {
1333 if (!starts_with(ref
->name
, "refs/tags/"))
1334 continue; /* not a tag */
1335 if (string_list_has_string(&dst_tag
, ref
->name
))
1336 continue; /* they already have it */
1337 if (sha1_object_info(ref
->new_oid
.hash
, NULL
) != OBJ_TAG
)
1338 continue; /* be conservative */
1339 item
= string_list_append(&src_tag
, ref
->name
);
1342 string_list_clear(&dst_tag
, 0);
1345 * At this point, src_tag lists tags that are missing from
1346 * dst, and sent_tips lists the tips we are pushing or those
1347 * that we know they already have. An element in the src_tag
1348 * that is an ancestor of any of the sent_tips needs to be
1349 * sent to the other side.
1352 for_each_string_list_item(item
, &src_tag
) {
1353 struct ref
*ref
= item
->util
;
1354 struct ref
*dst_ref
;
1355 struct commit
*commit
;
1357 if (is_null_oid(&ref
->new_oid
))
1359 commit
= lookup_commit_reference_gently(&ref
->new_oid
,
1362 /* not pushing a commit, which is not an error */
1366 * Is this tag, which they do not have, reachable from
1367 * any of the commits we are sending?
1369 if (!in_merge_bases_many(commit
, sent_tips
.nr
, sent_tips
.tip
))
1373 dst_ref
= make_linked_ref(ref
->name
, dst_tail
);
1374 oidcpy(&dst_ref
->new_oid
, &ref
->new_oid
);
1375 dst_ref
->peer_ref
= copy_ref(ref
);
1378 string_list_clear(&src_tag
, 0);
1379 free(sent_tips
.tip
);
1382 struct ref
*find_ref_by_name(const struct ref
*list
, const char *name
)
1384 for ( ; list
; list
= list
->next
)
1385 if (!strcmp(list
->name
, name
))
1386 return (struct ref
*)list
;
1390 static void prepare_ref_index(struct string_list
*ref_index
, struct ref
*ref
)
1392 for ( ; ref
; ref
= ref
->next
)
1393 string_list_append_nodup(ref_index
, ref
->name
)->util
= ref
;
1395 string_list_sort(ref_index
);
1399 * Given only the set of local refs, sanity-check the set of push
1400 * refspecs. We can't catch all errors that match_push_refs would,
1401 * but we can catch some errors early before even talking to the
1404 int check_push_refs(struct ref
*src
, int nr_refspec
, const char **refspec_names
)
1406 struct refspec
*refspec
= parse_push_refspec(nr_refspec
, refspec_names
);
1410 for (i
= 0; i
< nr_refspec
; i
++) {
1411 struct refspec
*rs
= refspec
+ i
;
1413 if (rs
->pattern
|| rs
->matching
)
1416 ret
|= match_explicit_lhs(src
, rs
, NULL
, NULL
);
1419 free_refspec(nr_refspec
, refspec
);
1424 * Given the set of refs the local repository has, the set of refs the
1425 * remote repository has, and the refspec used for push, determine
1426 * what remote refs we will update and with what value by setting
1427 * peer_ref (which object is being pushed) and force (if the push is
1428 * forced) in elements of "dst". The function may add new elements to
1429 * dst (e.g. pushing to a new branch, done in match_explicit_refs).
1431 int match_push_refs(struct ref
*src
, struct ref
**dst
,
1432 int nr_refspec
, const char **refspec
, int flags
)
1435 int send_all
= flags
& MATCH_REFS_ALL
;
1436 int send_mirror
= flags
& MATCH_REFS_MIRROR
;
1437 int send_prune
= flags
& MATCH_REFS_PRUNE
;
1439 static const char *default_refspec
[] = { ":", NULL
};
1440 struct ref
*ref
, **dst_tail
= tail_ref(dst
);
1441 struct string_list dst_ref_index
= STRING_LIST_INIT_NODUP
;
1445 refspec
= default_refspec
;
1447 rs
= parse_push_refspec(nr_refspec
, (const char **) refspec
);
1448 errs
= match_explicit_refs(src
, *dst
, &dst_tail
, rs
, nr_refspec
);
1450 /* pick the remainder */
1451 for (ref
= src
; ref
; ref
= ref
->next
) {
1452 struct string_list_item
*dst_item
;
1453 struct ref
*dst_peer
;
1454 const struct refspec
*pat
= NULL
;
1457 dst_name
= get_ref_match(rs
, nr_refspec
, ref
, send_mirror
, FROM_SRC
, &pat
);
1461 if (!dst_ref_index
.nr
)
1462 prepare_ref_index(&dst_ref_index
, *dst
);
1464 dst_item
= string_list_lookup(&dst_ref_index
, dst_name
);
1465 dst_peer
= dst_item
? dst_item
->util
: NULL
;
1467 if (dst_peer
->peer_ref
)
1468 /* We're already sending something to this ref. */
1471 if (pat
->matching
&& !(send_all
|| send_mirror
))
1473 * Remote doesn't have it, and we have no
1474 * explicit pattern, and we don't have
1475 * --all or --mirror.
1479 /* Create a new one and link it */
1480 dst_peer
= make_linked_ref(dst_name
, &dst_tail
);
1481 oidcpy(&dst_peer
->new_oid
, &ref
->new_oid
);
1482 string_list_insert(&dst_ref_index
,
1483 dst_peer
->name
)->util
= dst_peer
;
1485 dst_peer
->peer_ref
= copy_ref(ref
);
1486 dst_peer
->force
= pat
->force
;
1491 string_list_clear(&dst_ref_index
, 0);
1493 if (flags
& MATCH_REFS_FOLLOW_TAGS
)
1494 add_missing_tags(src
, dst
, &dst_tail
);
1497 struct string_list src_ref_index
= STRING_LIST_INIT_NODUP
;
1498 /* check for missing refs on the remote */
1499 for (ref
= *dst
; ref
; ref
= ref
->next
) {
1503 /* We're already sending something to this ref. */
1506 src_name
= get_ref_match(rs
, nr_refspec
, ref
, send_mirror
, FROM_DST
, NULL
);
1508 if (!src_ref_index
.nr
)
1509 prepare_ref_index(&src_ref_index
, src
);
1510 if (!string_list_has_string(&src_ref_index
,
1512 ref
->peer_ref
= alloc_delete_ref();
1516 string_list_clear(&src_ref_index
, 0);
1523 void set_ref_status_for_push(struct ref
*remote_refs
, int send_mirror
,
1528 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
1529 int force_ref_update
= ref
->force
|| force_update
;
1530 int reject_reason
= 0;
1533 oidcpy(&ref
->new_oid
, &ref
->peer_ref
->new_oid
);
1534 else if (!send_mirror
)
1537 ref
->deletion
= is_null_oid(&ref
->new_oid
);
1538 if (!ref
->deletion
&&
1539 !oidcmp(&ref
->old_oid
, &ref
->new_oid
)) {
1540 ref
->status
= REF_STATUS_UPTODATE
;
1545 * If the remote ref has moved and is now different
1546 * from what we expect, reject any push.
1548 * It also is an error if the user told us to check
1549 * with the remote-tracking branch to find the value
1550 * to expect, but we did not have such a tracking
1553 if (ref
->expect_old_sha1
) {
1554 if (oidcmp(&ref
->old_oid
, &ref
->old_oid_expect
))
1555 reject_reason
= REF_STATUS_REJECT_STALE
;
1557 /* If the ref isn't stale then force the update. */
1558 force_ref_update
= 1;
1562 * If the update isn't already rejected then check
1563 * the usual "must fast-forward" rules.
1565 * Decide whether an individual refspec A:B can be
1566 * pushed. The push will succeed if any of the
1567 * following are true:
1569 * (1) the remote reference B does not exist
1571 * (2) the remote reference B is being removed (i.e.,
1572 * pushing :B where no source is specified)
1574 * (3) the destination is not under refs/tags/, and
1575 * if the old and new value is a commit, the new
1576 * is a descendant of the old.
1578 * (4) it is forced using the +A:B notation, or by
1579 * passing the --force argument
1582 if (!reject_reason
&& !ref
->deletion
&& !is_null_oid(&ref
->old_oid
)) {
1583 if (starts_with(ref
->name
, "refs/tags/"))
1584 reject_reason
= REF_STATUS_REJECT_ALREADY_EXISTS
;
1585 else if (!has_object_file(&ref
->old_oid
))
1586 reject_reason
= REF_STATUS_REJECT_FETCH_FIRST
;
1587 else if (!lookup_commit_reference_gently(&ref
->old_oid
, 1) ||
1588 !lookup_commit_reference_gently(&ref
->new_oid
, 1))
1589 reject_reason
= REF_STATUS_REJECT_NEEDS_FORCE
;
1590 else if (!ref_newer(&ref
->new_oid
, &ref
->old_oid
))
1591 reject_reason
= REF_STATUS_REJECT_NONFASTFORWARD
;
1595 * "--force" will defeat any rejection implemented
1596 * by the rules above.
1598 if (!force_ref_update
)
1599 ref
->status
= reject_reason
;
1600 else if (reject_reason
)
1601 ref
->forced_update
= 1;
1605 static void set_merge(struct branch
*ret
)
1607 struct remote
*remote
;
1609 struct object_id oid
;
1613 return; /* no branch */
1615 return; /* already run */
1616 if (!ret
->remote_name
|| !ret
->merge_nr
) {
1618 * no merge config; let's make sure we don't confuse callers
1619 * with a non-zero merge_nr but a NULL merge
1625 remote
= remote_get(ret
->remote_name
);
1627 ret
->merge
= xcalloc(ret
->merge_nr
, sizeof(*ret
->merge
));
1628 for (i
= 0; i
< ret
->merge_nr
; i
++) {
1629 ret
->merge
[i
] = xcalloc(1, sizeof(**ret
->merge
));
1630 ret
->merge
[i
]->src
= xstrdup(ret
->merge_name
[i
]);
1631 if (!remote_find_tracking(remote
, ret
->merge
[i
]) ||
1632 strcmp(ret
->remote_name
, "."))
1634 if (dwim_ref(ret
->merge_name
[i
], strlen(ret
->merge_name
[i
]),
1635 oid
.hash
, &ref
) == 1)
1636 ret
->merge
[i
]->dst
= ref
;
1638 ret
->merge
[i
]->dst
= xstrdup(ret
->merge_name
[i
]);
1642 struct branch
*branch_get(const char *name
)
1647 if (!name
|| !*name
|| !strcmp(name
, "HEAD"))
1648 ret
= current_branch
;
1650 ret
= make_branch(name
, 0);
1655 int branch_has_merge_config(struct branch
*branch
)
1657 return branch
&& !!branch
->merge
;
1660 int branch_merge_matches(struct branch
*branch
,
1662 const char *refname
)
1664 if (!branch
|| i
< 0 || i
>= branch
->merge_nr
)
1666 return refname_match(branch
->merge
[i
]->src
, refname
);
1669 __attribute__((format (printf
,2,3)))
1670 static const char *error_buf(struct strbuf
*err
, const char *fmt
, ...)
1675 strbuf_vaddf(err
, fmt
, ap
);
1681 const char *branch_get_upstream(struct branch
*branch
, struct strbuf
*err
)
1684 return error_buf(err
, _("HEAD does not point to a branch"));
1686 if (!branch
->merge
|| !branch
->merge
[0]) {
1688 * no merge config; is it because the user didn't define any,
1689 * or because it is not a real branch, and get_branch
1692 if (!ref_exists(branch
->refname
))
1693 return error_buf(err
, _("no such branch: '%s'"),
1695 return error_buf(err
,
1696 _("no upstream configured for branch '%s'"),
1700 if (!branch
->merge
[0]->dst
)
1701 return error_buf(err
,
1702 _("upstream branch '%s' not stored as a remote-tracking branch"),
1703 branch
->merge
[0]->src
);
1705 return branch
->merge
[0]->dst
;
1708 static const char *tracking_for_push_dest(struct remote
*remote
,
1709 const char *refname
,
1714 ret
= apply_refspecs(remote
->fetch
, remote
->fetch_refspec_nr
, refname
);
1716 return error_buf(err
,
1717 _("push destination '%s' on remote '%s' has no local tracking branch"),
1718 refname
, remote
->name
);
1722 static const char *branch_get_push_1(struct branch
*branch
, struct strbuf
*err
)
1724 struct remote
*remote
;
1726 remote
= remote_get(pushremote_for_branch(branch
, NULL
));
1728 return error_buf(err
,
1729 _("branch '%s' has no remote for pushing"),
1732 if (remote
->push_refspec_nr
) {
1736 dst
= apply_refspecs(remote
->push
, remote
->push_refspec_nr
,
1739 return error_buf(err
,
1740 _("push refspecs for '%s' do not include '%s'"),
1741 remote
->name
, branch
->name
);
1743 ret
= tracking_for_push_dest(remote
, dst
, err
);
1749 return tracking_for_push_dest(remote
, branch
->refname
, err
);
1751 switch (push_default
) {
1752 case PUSH_DEFAULT_NOTHING
:
1753 return error_buf(err
, _("push has no destination (push.default is 'nothing')"));
1755 case PUSH_DEFAULT_MATCHING
:
1756 case PUSH_DEFAULT_CURRENT
:
1757 return tracking_for_push_dest(remote
, branch
->refname
, err
);
1759 case PUSH_DEFAULT_UPSTREAM
:
1760 return branch_get_upstream(branch
, err
);
1762 case PUSH_DEFAULT_UNSPECIFIED
:
1763 case PUSH_DEFAULT_SIMPLE
:
1765 const char *up
, *cur
;
1767 up
= branch_get_upstream(branch
, err
);
1770 cur
= tracking_for_push_dest(remote
, branch
->refname
, err
);
1773 if (strcmp(cur
, up
))
1774 return error_buf(err
,
1775 _("cannot resolve 'simple' push to a single destination"));
1780 die("BUG: unhandled push situation");
1783 const char *branch_get_push(struct branch
*branch
, struct strbuf
*err
)
1786 return error_buf(err
, _("HEAD does not point to a branch"));
1788 if (!branch
->push_tracking_ref
)
1789 branch
->push_tracking_ref
= branch_get_push_1(branch
, err
);
1790 return branch
->push_tracking_ref
;
1793 static int ignore_symref_update(const char *refname
)
1795 struct object_id oid
;
1798 if (!resolve_ref_unsafe(refname
, 0, oid
.hash
, &flag
))
1799 return 0; /* non-existing refs are OK */
1800 return (flag
& REF_ISSYMREF
);
1804 * Create and return a list of (struct ref) consisting of copies of
1805 * each remote_ref that matches refspec. refspec must be a pattern.
1806 * Fill in the copies' peer_ref to describe the local tracking refs to
1807 * which they map. Omit any references that would map to an existing
1808 * local symbolic ref.
1810 static struct ref
*get_expanded_map(const struct ref
*remote_refs
,
1811 const struct refspec
*refspec
)
1813 const struct ref
*ref
;
1814 struct ref
*ret
= NULL
;
1815 struct ref
**tail
= &ret
;
1817 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
1818 char *expn_name
= NULL
;
1820 if (strchr(ref
->name
, '^'))
1821 continue; /* a dereference item */
1822 if (match_name_with_pattern(refspec
->src
, ref
->name
,
1823 refspec
->dst
, &expn_name
) &&
1824 !ignore_symref_update(expn_name
)) {
1825 struct ref
*cpy
= copy_ref(ref
);
1827 cpy
->peer_ref
= alloc_ref(expn_name
);
1829 cpy
->peer_ref
->force
= 1;
1839 static const struct ref
*find_ref_by_name_abbrev(const struct ref
*refs
, const char *name
)
1841 const struct ref
*ref
;
1842 for (ref
= refs
; ref
; ref
= ref
->next
) {
1843 if (refname_match(name
, ref
->name
))
1849 struct ref
*get_remote_ref(const struct ref
*remote_refs
, const char *name
)
1851 const struct ref
*ref
= find_ref_by_name_abbrev(remote_refs
, name
);
1856 return copy_ref(ref
);
1859 static struct ref
*get_local_ref(const char *name
)
1861 if (!name
|| name
[0] == '\0')
1864 if (starts_with(name
, "refs/"))
1865 return alloc_ref(name
);
1867 if (starts_with(name
, "heads/") ||
1868 starts_with(name
, "tags/") ||
1869 starts_with(name
, "remotes/"))
1870 return alloc_ref_with_prefix("refs/", 5, name
);
1872 return alloc_ref_with_prefix("refs/heads/", 11, name
);
1875 int get_fetch_map(const struct ref
*remote_refs
,
1876 const struct refspec
*refspec
,
1880 struct ref
*ref_map
, **rmp
;
1882 if (refspec
->pattern
) {
1883 ref_map
= get_expanded_map(remote_refs
, refspec
);
1885 const char *name
= refspec
->src
[0] ? refspec
->src
: "HEAD";
1887 if (refspec
->exact_sha1
) {
1888 ref_map
= alloc_ref(name
);
1889 get_oid_hex(name
, &ref_map
->old_oid
);
1891 ref_map
= get_remote_ref(remote_refs
, name
);
1893 if (!missing_ok
&& !ref_map
)
1894 die("Couldn't find remote ref %s", name
);
1896 ref_map
->peer_ref
= get_local_ref(refspec
->dst
);
1897 if (ref_map
->peer_ref
&& refspec
->force
)
1898 ref_map
->peer_ref
->force
= 1;
1902 for (rmp
= &ref_map
; *rmp
; ) {
1903 if ((*rmp
)->peer_ref
) {
1904 if (!starts_with((*rmp
)->peer_ref
->name
, "refs/") ||
1905 check_refname_format((*rmp
)->peer_ref
->name
, 0)) {
1906 struct ref
*ignore
= *rmp
;
1907 error("* Ignoring funny ref '%s' locally",
1908 (*rmp
)->peer_ref
->name
);
1909 *rmp
= (*rmp
)->next
;
1910 free(ignore
->peer_ref
);
1915 rmp
= &((*rmp
)->next
);
1919 tail_link_ref(ref_map
, tail
);
1924 int resolve_remote_symref(struct ref
*ref
, struct ref
*list
)
1928 for (; list
; list
= list
->next
)
1929 if (!strcmp(ref
->symref
, list
->name
)) {
1930 oidcpy(&ref
->old_oid
, &list
->old_oid
);
1936 static void unmark_and_free(struct commit_list
*list
, unsigned int mark
)
1939 struct commit
*commit
= pop_commit(&list
);
1940 commit
->object
.flags
&= ~mark
;
1944 int ref_newer(const struct object_id
*new_oid
, const struct object_id
*old_oid
)
1947 struct commit
*old
, *new;
1948 struct commit_list
*list
, *used
;
1952 * Both new and old must be commit-ish and new is descendant of
1953 * old. Otherwise we require --force.
1955 o
= deref_tag(parse_object(old_oid
), NULL
, 0);
1956 if (!o
|| o
->type
!= OBJ_COMMIT
)
1958 old
= (struct commit
*) o
;
1960 o
= deref_tag(parse_object(new_oid
), NULL
, 0);
1961 if (!o
|| o
->type
!= OBJ_COMMIT
)
1963 new = (struct commit
*) o
;
1965 if (parse_commit(new) < 0)
1969 commit_list_insert(new, &list
);
1971 new = pop_most_recent_commit(&list
, TMP_MARK
);
1972 commit_list_insert(new, &used
);
1978 unmark_and_free(list
, TMP_MARK
);
1979 unmark_and_free(used
, TMP_MARK
);
1984 * Compare a branch with its upstream, and save their differences (number
1985 * of commits) in *num_ours and *num_theirs. The name of the upstream branch
1986 * (or NULL if no upstream is defined) is returned via *upstream_name, if it
1987 * is not itself NULL.
1989 * Returns -1 if num_ours and num_theirs could not be filled in (e.g., no
1990 * upstream defined, or ref does not exist), 0 otherwise.
1992 int stat_tracking_info(struct branch
*branch
, int *num_ours
, int *num_theirs
,
1993 const char **upstream_name
)
1995 struct object_id oid
;
1996 struct commit
*ours
, *theirs
;
1997 struct rev_info revs
;
1999 struct argv_array argv
= ARGV_ARRAY_INIT
;
2001 /* Cannot stat unless we are marked to build on top of somebody else. */
2002 base
= branch_get_upstream(branch
, NULL
);
2004 *upstream_name
= base
;
2008 /* Cannot stat if what we used to build on no longer exists */
2009 if (read_ref(base
, oid
.hash
))
2011 theirs
= lookup_commit_reference(&oid
);
2015 if (read_ref(branch
->refname
, oid
.hash
))
2017 ours
= lookup_commit_reference(&oid
);
2021 /* are we the same? */
2022 if (theirs
== ours
) {
2023 *num_theirs
= *num_ours
= 0;
2027 /* Run "rev-list --left-right ours...theirs" internally... */
2028 argv_array_push(&argv
, ""); /* ignored */
2029 argv_array_push(&argv
, "--left-right");
2030 argv_array_pushf(&argv
, "%s...%s",
2031 oid_to_hex(&ours
->object
.oid
),
2032 oid_to_hex(&theirs
->object
.oid
));
2033 argv_array_push(&argv
, "--");
2035 init_revisions(&revs
, NULL
);
2036 setup_revisions(argv
.argc
, argv
.argv
, &revs
, NULL
);
2037 if (prepare_revision_walk(&revs
))
2038 die("revision walk setup failed");
2040 /* ... and count the commits on each side. */
2044 struct commit
*c
= get_revision(&revs
);
2047 if (c
->object
.flags
& SYMMETRIC_LEFT
)
2053 /* clear object flags smudged by the above traversal */
2054 clear_commit_marks(ours
, ALL_REV_FLAGS
);
2055 clear_commit_marks(theirs
, ALL_REV_FLAGS
);
2057 argv_array_clear(&argv
);
2062 * Return true when there is anything to report, otherwise false.
2064 int format_tracking_info(struct branch
*branch
, struct strbuf
*sb
)
2067 const char *full_base
;
2069 int upstream_is_gone
= 0;
2071 if (stat_tracking_info(branch
, &ours
, &theirs
, &full_base
) < 0) {
2074 upstream_is_gone
= 1;
2077 base
= shorten_unambiguous_ref(full_base
, 0);
2078 if (upstream_is_gone
) {
2080 _("Your branch is based on '%s', but the upstream is gone.\n"),
2082 if (advice_status_hints
)
2084 _(" (use \"git branch --unset-upstream\" to fixup)\n"));
2085 } else if (!ours
&& !theirs
) {
2087 _("Your branch is up-to-date with '%s'.\n"),
2089 } else if (!theirs
) {
2091 Q_("Your branch is ahead of '%s' by %d commit.\n",
2092 "Your branch is ahead of '%s' by %d commits.\n",
2095 if (advice_status_hints
)
2097 _(" (use \"git push\" to publish your local commits)\n"));
2100 Q_("Your branch is behind '%s' by %d commit, "
2101 "and can be fast-forwarded.\n",
2102 "Your branch is behind '%s' by %d commits, "
2103 "and can be fast-forwarded.\n",
2106 if (advice_status_hints
)
2108 _(" (use \"git pull\" to update your local branch)\n"));
2111 Q_("Your branch and '%s' have diverged,\n"
2112 "and have %d and %d different commit each, "
2114 "Your branch and '%s' have diverged,\n"
2115 "and have %d and %d different commits each, "
2118 base
, ours
, theirs
);
2119 if (advice_status_hints
)
2121 _(" (use \"git pull\" to merge the remote branch into yours)\n"));
2127 static int one_local_ref(const char *refname
, const struct object_id
*oid
,
2128 int flag
, void *cb_data
)
2130 struct ref
***local_tail
= cb_data
;
2133 /* we already know it starts with refs/ to get here */
2134 if (check_refname_format(refname
+ 5, 0))
2137 ref
= alloc_ref(refname
);
2138 oidcpy(&ref
->new_oid
, oid
);
2140 *local_tail
= &ref
->next
;
2144 struct ref
*get_local_heads(void)
2146 struct ref
*local_refs
= NULL
, **local_tail
= &local_refs
;
2148 for_each_ref(one_local_ref
, &local_tail
);
2152 struct ref
*guess_remote_head(const struct ref
*head
,
2153 const struct ref
*refs
,
2156 const struct ref
*r
;
2157 struct ref
*list
= NULL
;
2158 struct ref
**tail
= &list
;
2164 * Some transports support directly peeking at
2165 * where HEAD points; if that is the case, then
2166 * we don't have to guess.
2169 return copy_ref(find_ref_by_name(refs
, head
->symref
));
2171 /* If refs/heads/master could be right, it is. */
2173 r
= find_ref_by_name(refs
, "refs/heads/master");
2174 if (r
&& !oidcmp(&r
->old_oid
, &head
->old_oid
))
2178 /* Look for another ref that points there */
2179 for (r
= refs
; r
; r
= r
->next
) {
2181 starts_with(r
->name
, "refs/heads/") &&
2182 !oidcmp(&r
->old_oid
, &head
->old_oid
)) {
2183 *tail
= copy_ref(r
);
2184 tail
= &((*tail
)->next
);
2193 struct stale_heads_info
{
2194 struct string_list
*ref_names
;
2195 struct ref
**stale_refs_tail
;
2196 struct refspec
*refs
;
2200 static int get_stale_heads_cb(const char *refname
, const struct object_id
*oid
,
2201 int flags
, void *cb_data
)
2203 struct stale_heads_info
*info
= cb_data
;
2204 struct string_list matches
= STRING_LIST_INIT_DUP
;
2205 struct refspec query
;
2207 memset(&query
, 0, sizeof(struct refspec
));
2208 query
.dst
= (char *)refname
;
2210 query_refspecs_multiple(info
->refs
, info
->ref_count
, &query
, &matches
);
2211 if (matches
.nr
== 0)
2212 goto clean_exit
; /* No matches */
2215 * If we did find a suitable refspec and it's not a symref and
2216 * it's not in the list of refs that currently exist in that
2217 * remote, we consider it to be stale. In order to deal with
2218 * overlapping refspecs, we need to go over all of the
2221 if (flags
& REF_ISSYMREF
)
2224 for (i
= 0; stale
&& i
< matches
.nr
; i
++)
2225 if (string_list_has_string(info
->ref_names
, matches
.items
[i
].string
))
2229 struct ref
*ref
= make_linked_ref(refname
, &info
->stale_refs_tail
);
2230 oidcpy(&ref
->new_oid
, oid
);
2234 string_list_clear(&matches
, 0);
2238 struct ref
*get_stale_heads(struct refspec
*refs
, int ref_count
, struct ref
*fetch_map
)
2240 struct ref
*ref
, *stale_refs
= NULL
;
2241 struct string_list ref_names
= STRING_LIST_INIT_NODUP
;
2242 struct stale_heads_info info
;
2244 info
.ref_names
= &ref_names
;
2245 info
.stale_refs_tail
= &stale_refs
;
2247 info
.ref_count
= ref_count
;
2248 for (ref
= fetch_map
; ref
; ref
= ref
->next
)
2249 string_list_append(&ref_names
, ref
->name
);
2250 string_list_sort(&ref_names
);
2251 for_each_ref(get_stale_heads_cb
, &info
);
2252 string_list_clear(&ref_names
, 0);
2259 static void clear_cas_option(struct push_cas_option
*cas
)
2263 for (i
= 0; i
< cas
->nr
; i
++)
2264 free(cas
->entry
[i
].refname
);
2266 memset(cas
, 0, sizeof(*cas
));
2269 static struct push_cas
*add_cas_entry(struct push_cas_option
*cas
,
2270 const char *refname
,
2273 struct push_cas
*entry
;
2274 ALLOC_GROW(cas
->entry
, cas
->nr
+ 1, cas
->alloc
);
2275 entry
= &cas
->entry
[cas
->nr
++];
2276 memset(entry
, 0, sizeof(*entry
));
2277 entry
->refname
= xmemdupz(refname
, refnamelen
);
2281 static int parse_push_cas_option(struct push_cas_option
*cas
, const char *arg
, int unset
)
2284 struct push_cas
*entry
;
2287 /* "--no-<option>" */
2288 clear_cas_option(cas
);
2293 /* just "--<option>" */
2294 cas
->use_tracking_for_rest
= 1;
2298 /* "--<option>=refname" or "--<option>=refname:value" */
2299 colon
= strchrnul(arg
, ':');
2300 entry
= add_cas_entry(cas
, arg
, colon
- arg
);
2302 entry
->use_tracking
= 1;
2304 hashclr(entry
->expect
);
2305 else if (get_sha1(colon
+ 1, entry
->expect
))
2306 return error("cannot parse expected object name '%s'", colon
+ 1);
2310 int parseopt_push_cas_option(const struct option
*opt
, const char *arg
, int unset
)
2312 return parse_push_cas_option(opt
->value
, arg
, unset
);
2315 int is_empty_cas(const struct push_cas_option
*cas
)
2317 return !cas
->use_tracking_for_rest
&& !cas
->nr
;
2321 * Look at remote.fetch refspec and see if we have a remote
2322 * tracking branch for the refname there. Fill its current
2324 * If we cannot do so, return negative to signal an error.
2326 static int remote_tracking(struct remote
*remote
, const char *refname
,
2327 struct object_id
*oid
)
2331 dst
= apply_refspecs(remote
->fetch
, remote
->fetch_refspec_nr
, refname
);
2333 return -1; /* no tracking ref for refname at remote */
2334 if (read_ref(dst
, oid
->hash
))
2335 return -1; /* we know what the tracking ref is but we cannot read it */
2339 static void apply_cas(struct push_cas_option
*cas
,
2340 struct remote
*remote
,
2345 /* Find an explicit --<option>=<name>[:<value>] entry */
2346 for (i
= 0; i
< cas
->nr
; i
++) {
2347 struct push_cas
*entry
= &cas
->entry
[i
];
2348 if (!refname_match(entry
->refname
, ref
->name
))
2350 ref
->expect_old_sha1
= 1;
2351 if (!entry
->use_tracking
)
2352 hashcpy(ref
->old_oid_expect
.hash
, cas
->entry
[i
].expect
);
2353 else if (remote_tracking(remote
, ref
->name
, &ref
->old_oid_expect
))
2354 oidclr(&ref
->old_oid_expect
);
2358 /* Are we using "--<option>" to cover all? */
2359 if (!cas
->use_tracking_for_rest
)
2362 ref
->expect_old_sha1
= 1;
2363 if (remote_tracking(remote
, ref
->name
, &ref
->old_oid_expect
))
2364 oidclr(&ref
->old_oid_expect
);
2367 void apply_push_cas(struct push_cas_option
*cas
,
2368 struct remote
*remote
,
2369 struct ref
*remote_refs
)
2372 for (ref
= remote_refs
; ref
; ref
= ref
->next
)
2373 apply_cas(cas
, remote
, ref
);