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 /* See TAG_REFSPEC for the string version */
26 const struct refspec
*tag_refspec
= &s_tag_refspec
;
28 struct counted_string
{
35 struct counted_string
*instead_of
;
40 struct rewrite
**rewrite
;
45 static struct remote
**remotes
;
46 static int remotes_alloc
;
47 static int remotes_nr
;
48 static struct hashmap remotes_hash
;
50 static struct branch
**branches
;
51 static int branches_alloc
;
52 static int branches_nr
;
54 static struct branch
*current_branch
;
55 static const char *pushremote_name
;
57 static struct rewrites rewrites
;
58 static struct rewrites rewrites_push
;
60 static int valid_remote(const struct remote
*remote
)
62 return (!!remote
->url
) || (!!remote
->foreign_vcs
);
65 static const char *alias_url(const char *url
, struct rewrites
*r
)
68 struct counted_string
*longest
;
73 for (i
= 0; i
< r
->rewrite_nr
; i
++) {
76 for (j
= 0; j
< r
->rewrite
[i
]->instead_of_nr
; j
++) {
77 if (starts_with(url
, r
->rewrite
[i
]->instead_of
[j
].s
) &&
79 longest
->len
< r
->rewrite
[i
]->instead_of
[j
].len
)) {
80 longest
= &(r
->rewrite
[i
]->instead_of
[j
]);
88 return xstrfmt("%s%s", r
->rewrite
[longest_i
]->base
, url
+ longest
->len
);
91 static void add_push_refspec(struct remote
*remote
, const char *ref
)
93 ALLOC_GROW(remote
->push_refspec
,
94 remote
->push_refspec_nr
+ 1,
95 remote
->push_refspec_alloc
);
96 remote
->push_refspec
[remote
->push_refspec_nr
++] = ref
;
99 static void add_fetch_refspec(struct remote
*remote
, const char *ref
)
101 ALLOC_GROW(remote
->fetch_refspec
,
102 remote
->fetch_refspec_nr
+ 1,
103 remote
->fetch_refspec_alloc
);
104 remote
->fetch_refspec
[remote
->fetch_refspec_nr
++] = ref
;
107 static void add_url(struct remote
*remote
, const char *url
)
109 ALLOC_GROW(remote
->url
, remote
->url_nr
+ 1, remote
->url_alloc
);
110 remote
->url
[remote
->url_nr
++] = url
;
113 static void add_pushurl(struct remote
*remote
, const char *pushurl
)
115 ALLOC_GROW(remote
->pushurl
, remote
->pushurl_nr
+ 1, remote
->pushurl_alloc
);
116 remote
->pushurl
[remote
->pushurl_nr
++] = pushurl
;
119 static void add_pushurl_alias(struct remote
*remote
, const char *url
)
121 const char *pushurl
= alias_url(url
, &rewrites_push
);
123 add_pushurl(remote
, pushurl
);
126 static void add_url_alias(struct remote
*remote
, const char *url
)
128 add_url(remote
, alias_url(url
, &rewrites
));
129 add_pushurl_alias(remote
, url
);
132 struct remotes_hash_key
{
137 static int remotes_hash_cmp(const void *unused_cmp_data
,
139 const void *entry_or_key
,
142 const struct remote
*a
= entry
;
143 const struct remote
*b
= entry_or_key
;
144 const struct remotes_hash_key
*key
= keydata
;
147 return strncmp(a
->name
, key
->str
, key
->len
) || a
->name
[key
->len
];
149 return strcmp(a
->name
, b
->name
);
152 static inline void init_remotes_hash(void)
154 if (!remotes_hash
.cmpfn
)
155 hashmap_init(&remotes_hash
, remotes_hash_cmp
, NULL
, 0);
158 static struct remote
*make_remote(const char *name
, int len
)
160 struct remote
*ret
, *replaced
;
161 struct remotes_hash_key lookup
;
162 struct hashmap_entry lookup_entry
;
170 hashmap_entry_init(&lookup_entry
, memhash(name
, len
));
172 if ((ret
= hashmap_get(&remotes_hash
, &lookup_entry
, &lookup
)) != NULL
)
175 ret
= xcalloc(1, sizeof(struct remote
));
176 ret
->prune
= -1; /* unspecified */
177 ALLOC_GROW(remotes
, remotes_nr
+ 1, remotes_alloc
);
178 remotes
[remotes_nr
++] = ret
;
179 ret
->name
= xstrndup(name
, len
);
181 hashmap_entry_init(ret
, lookup_entry
.hash
);
182 replaced
= hashmap_put(&remotes_hash
, ret
);
183 assert(replaced
== NULL
); /* no previous entry overwritten */
187 static void add_merge(struct branch
*branch
, const char *name
)
189 ALLOC_GROW(branch
->merge_name
, branch
->merge_nr
+ 1,
190 branch
->merge_alloc
);
191 branch
->merge_name
[branch
->merge_nr
++] = name
;
194 static struct branch
*make_branch(const char *name
, int len
)
199 for (i
= 0; i
< branches_nr
; i
++) {
200 if (len
? (!strncmp(name
, branches
[i
]->name
, len
) &&
201 !branches
[i
]->name
[len
]) :
202 !strcmp(name
, branches
[i
]->name
))
206 ALLOC_GROW(branches
, branches_nr
+ 1, branches_alloc
);
207 ret
= xcalloc(1, sizeof(struct branch
));
208 branches
[branches_nr
++] = ret
;
210 ret
->name
= xstrndup(name
, len
);
212 ret
->name
= xstrdup(name
);
213 ret
->refname
= xstrfmt("refs/heads/%s", ret
->name
);
218 static struct rewrite
*make_rewrite(struct rewrites
*r
, const char *base
, int len
)
223 for (i
= 0; i
< r
->rewrite_nr
; i
++) {
225 ? (len
== r
->rewrite
[i
]->baselen
&&
226 !strncmp(base
, r
->rewrite
[i
]->base
, len
))
227 : !strcmp(base
, r
->rewrite
[i
]->base
))
228 return r
->rewrite
[i
];
231 ALLOC_GROW(r
->rewrite
, r
->rewrite_nr
+ 1, r
->rewrite_alloc
);
232 ret
= xcalloc(1, sizeof(struct rewrite
));
233 r
->rewrite
[r
->rewrite_nr
++] = ret
;
235 ret
->base
= xstrndup(base
, len
);
239 ret
->base
= xstrdup(base
);
240 ret
->baselen
= strlen(base
);
245 static void add_instead_of(struct rewrite
*rewrite
, const char *instead_of
)
247 ALLOC_GROW(rewrite
->instead_of
, rewrite
->instead_of_nr
+ 1, rewrite
->instead_of_alloc
);
248 rewrite
->instead_of
[rewrite
->instead_of_nr
].s
= instead_of
;
249 rewrite
->instead_of
[rewrite
->instead_of_nr
].len
= strlen(instead_of
);
250 rewrite
->instead_of_nr
++;
253 static const char *skip_spaces(const char *s
)
260 static void read_remotes_file(struct remote
*remote
)
262 struct strbuf buf
= STRBUF_INIT
;
263 FILE *f
= fopen_or_warn(git_path("remotes/%s", remote
->name
), "r");
267 remote
->configured_in_repo
= 1;
268 remote
->origin
= REMOTE_REMOTES
;
269 while (strbuf_getline(&buf
, f
) != EOF
) {
274 if (skip_prefix(buf
.buf
, "URL:", &v
))
275 add_url_alias(remote
, xstrdup(skip_spaces(v
)));
276 else if (skip_prefix(buf
.buf
, "Push:", &v
))
277 add_push_refspec(remote
, xstrdup(skip_spaces(v
)));
278 else if (skip_prefix(buf
.buf
, "Pull:", &v
))
279 add_fetch_refspec(remote
, xstrdup(skip_spaces(v
)));
281 strbuf_release(&buf
);
285 static void read_branches_file(struct remote
*remote
)
288 struct strbuf buf
= STRBUF_INIT
;
289 FILE *f
= fopen_or_warn(git_path("branches/%s", remote
->name
), "r");
294 strbuf_getline_lf(&buf
, f
);
298 strbuf_release(&buf
);
302 remote
->configured_in_repo
= 1;
303 remote
->origin
= REMOTE_BRANCHES
;
306 * The branches file would have URL and optionally
307 * #branch specified. The "master" (or specified) branch is
308 * fetched and stored in the local branch matching the
311 frag
= strchr(buf
.buf
, '#');
317 add_url_alias(remote
, strbuf_detach(&buf
, NULL
));
318 add_fetch_refspec(remote
, xstrfmt("refs/heads/%s:refs/heads/%s",
319 frag
, remote
->name
));
322 * Cogito compatible push: push current HEAD to remote #branch
323 * (master if missing)
325 add_push_refspec(remote
, xstrfmt("HEAD:refs/heads/%s", frag
));
326 remote
->fetch_tags
= 1; /* always auto-follow */
329 static int handle_config(const char *key
, const char *value
, void *cb
)
334 struct remote
*remote
;
335 struct branch
*branch
;
336 if (parse_config_key(key
, "branch", &name
, &namelen
, &subkey
) >= 0) {
339 branch
= make_branch(name
, namelen
);
340 if (!strcmp(subkey
, "remote")) {
341 return git_config_string(&branch
->remote_name
, key
, value
);
342 } else if (!strcmp(subkey
, "pushremote")) {
343 return git_config_string(&branch
->pushremote_name
, key
, value
);
344 } else if (!strcmp(subkey
, "merge")) {
346 return config_error_nonbool(key
);
347 add_merge(branch
, xstrdup(value
));
351 if (parse_config_key(key
, "url", &name
, &namelen
, &subkey
) >= 0) {
352 struct rewrite
*rewrite
;
355 if (!strcmp(subkey
, "insteadof")) {
356 rewrite
= make_rewrite(&rewrites
, name
, namelen
);
358 return config_error_nonbool(key
);
359 add_instead_of(rewrite
, xstrdup(value
));
360 } else if (!strcmp(subkey
, "pushinsteadof")) {
361 rewrite
= make_rewrite(&rewrites_push
, name
, namelen
);
363 return config_error_nonbool(key
);
364 add_instead_of(rewrite
, xstrdup(value
));
368 if (parse_config_key(key
, "remote", &name
, &namelen
, &subkey
) < 0)
371 /* Handle remote.* variables */
372 if (!name
&& !strcmp(subkey
, "pushdefault"))
373 return git_config_string(&pushremote_name
, key
, value
);
377 /* Handle remote.<name>.* variables */
379 warning("Config remote shorthand cannot begin with '/': %s",
383 remote
= make_remote(name
, namelen
);
384 remote
->origin
= REMOTE_CONFIG
;
385 if (current_config_scope() == CONFIG_SCOPE_REPO
)
386 remote
->configured_in_repo
= 1;
387 if (!strcmp(subkey
, "mirror"))
388 remote
->mirror
= git_config_bool(key
, value
);
389 else if (!strcmp(subkey
, "skipdefaultupdate"))
390 remote
->skip_default_update
= git_config_bool(key
, value
);
391 else if (!strcmp(subkey
, "skipfetchall"))
392 remote
->skip_default_update
= git_config_bool(key
, value
);
393 else if (!strcmp(subkey
, "prune"))
394 remote
->prune
= git_config_bool(key
, value
);
395 else if (!strcmp(subkey
, "url")) {
397 if (git_config_string(&v
, key
, value
))
400 } else if (!strcmp(subkey
, "pushurl")) {
402 if (git_config_string(&v
, key
, value
))
404 add_pushurl(remote
, v
);
405 } else if (!strcmp(subkey
, "push")) {
407 if (git_config_string(&v
, key
, value
))
409 add_push_refspec(remote
, v
);
410 } else if (!strcmp(subkey
, "fetch")) {
412 if (git_config_string(&v
, key
, value
))
414 add_fetch_refspec(remote
, v
);
415 } else if (!strcmp(subkey
, "receivepack")) {
417 if (git_config_string(&v
, key
, value
))
419 if (!remote
->receivepack
)
420 remote
->receivepack
= v
;
422 error("more than one receivepack given, using the first");
423 } else if (!strcmp(subkey
, "uploadpack")) {
425 if (git_config_string(&v
, key
, value
))
427 if (!remote
->uploadpack
)
428 remote
->uploadpack
= v
;
430 error("more than one uploadpack given, using the first");
431 } else if (!strcmp(subkey
, "tagopt")) {
432 if (!strcmp(value
, "--no-tags"))
433 remote
->fetch_tags
= -1;
434 else if (!strcmp(value
, "--tags"))
435 remote
->fetch_tags
= 2;
436 } else if (!strcmp(subkey
, "proxy")) {
437 return git_config_string((const char **)&remote
->http_proxy
,
439 } else if (!strcmp(subkey
, "proxyauthmethod")) {
440 return git_config_string((const char **)&remote
->http_proxy_authmethod
,
442 } else if (!strcmp(subkey
, "vcs")) {
443 return git_config_string(&remote
->foreign_vcs
, key
, value
);
448 static void alias_all_urls(void)
451 for (i
= 0; i
< remotes_nr
; i
++) {
452 int add_pushurl_aliases
;
455 for (j
= 0; j
< remotes
[i
]->pushurl_nr
; j
++) {
456 remotes
[i
]->pushurl
[j
] = alias_url(remotes
[i
]->pushurl
[j
], &rewrites
);
458 add_pushurl_aliases
= remotes
[i
]->pushurl_nr
== 0;
459 for (j
= 0; j
< remotes
[i
]->url_nr
; j
++) {
460 if (add_pushurl_aliases
)
461 add_pushurl_alias(remotes
[i
], remotes
[i
]->url
[j
]);
462 remotes
[i
]->url
[j
] = alias_url(remotes
[i
]->url
[j
], &rewrites
);
467 static void read_config(void)
476 current_branch
= NULL
;
477 if (startup_info
->have_repository
) {
478 const char *head_ref
= resolve_ref_unsafe("HEAD", 0, NULL
, &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 const char *remote_ref_for_branch(struct branch
*branch
, int for_push
,
684 if (branch
->merge_nr
) {
687 return branch
->merge_name
[0];
690 const char *dst
, *remote_name
=
691 pushremote_for_branch(branch
, NULL
);
692 struct remote
*remote
= remote_get(remote_name
);
694 if (remote
&& remote
->push_refspec_nr
&&
695 (dst
= apply_refspecs(remote
->push
,
696 remote
->push_refspec_nr
,
709 static struct remote
*remote_get_1(const char *name
,
710 const char *(*get_default
)(struct branch
*, int *))
720 name
= get_default(current_branch
, &name_given
);
722 ret
= make_remote(name
, 0);
723 if (valid_remote_nick(name
) && have_git_dir()) {
724 if (!valid_remote(ret
))
725 read_remotes_file(ret
);
726 if (!valid_remote(ret
))
727 read_branches_file(ret
);
729 if (name_given
&& !valid_remote(ret
))
730 add_url_alias(ret
, name
);
731 if (!valid_remote(ret
))
733 ret
->fetch
= parse_fetch_refspec(ret
->fetch_refspec_nr
, ret
->fetch_refspec
);
734 ret
->push
= parse_push_refspec(ret
->push_refspec_nr
, ret
->push_refspec
);
738 struct remote
*remote_get(const char *name
)
740 return remote_get_1(name
, remote_for_branch
);
743 struct remote
*pushremote_get(const char *name
)
745 return remote_get_1(name
, pushremote_for_branch
);
748 int remote_is_configured(struct remote
*remote
, int in_repo
)
753 return remote
->configured_in_repo
;
754 return !!remote
->origin
;
757 int for_each_remote(each_remote_fn fn
, void *priv
)
761 for (i
= 0; i
< remotes_nr
&& !result
; i
++) {
762 struct remote
*r
= remotes
[i
];
766 r
->fetch
= parse_fetch_refspec(r
->fetch_refspec_nr
,
769 r
->push
= parse_push_refspec(r
->push_refspec_nr
,
771 result
= fn(r
, priv
);
776 static void handle_duplicate(struct ref
*ref1
, struct ref
*ref2
)
778 if (strcmp(ref1
->name
, ref2
->name
)) {
779 if (ref1
->fetch_head_status
!= FETCH_HEAD_IGNORE
&&
780 ref2
->fetch_head_status
!= FETCH_HEAD_IGNORE
) {
781 die(_("Cannot fetch both %s and %s to %s"),
782 ref1
->name
, ref2
->name
, ref2
->peer_ref
->name
);
783 } else if (ref1
->fetch_head_status
!= FETCH_HEAD_IGNORE
&&
784 ref2
->fetch_head_status
== FETCH_HEAD_IGNORE
) {
785 warning(_("%s usually tracks %s, not %s"),
786 ref2
->peer_ref
->name
, ref2
->name
, ref1
->name
);
787 } else if (ref1
->fetch_head_status
== FETCH_HEAD_IGNORE
&&
788 ref2
->fetch_head_status
== FETCH_HEAD_IGNORE
) {
789 die(_("%s tracks both %s and %s"),
790 ref2
->peer_ref
->name
, ref1
->name
, ref2
->name
);
793 * This last possibility doesn't occur because
794 * FETCH_HEAD_IGNORE entries always appear at
795 * the end of the list.
797 die(_("Internal error"));
800 free(ref2
->peer_ref
);
804 struct ref
*ref_remove_duplicates(struct ref
*ref_map
)
806 struct string_list refs
= STRING_LIST_INIT_NODUP
;
807 struct ref
*retval
= NULL
;
808 struct ref
**p
= &retval
;
811 struct ref
*ref
= ref_map
;
813 ref_map
= ref_map
->next
;
816 if (!ref
->peer_ref
) {
820 struct string_list_item
*item
=
821 string_list_insert(&refs
, ref
->peer_ref
->name
);
824 /* Entry already existed */
825 handle_duplicate((struct ref
*)item
->util
, ref
);
834 string_list_clear(&refs
, 0);
838 int remote_has_url(struct remote
*remote
, const char *url
)
841 for (i
= 0; i
< remote
->url_nr
; i
++) {
842 if (!strcmp(remote
->url
[i
], url
))
848 static int match_name_with_pattern(const char *key
, const char *name
,
849 const char *value
, char **result
)
851 const char *kstar
= strchr(key
, '*');
857 die("Key '%s' of pattern had no '*'", key
);
859 ksuffixlen
= strlen(kstar
+ 1);
860 namelen
= strlen(name
);
861 ret
= !strncmp(name
, key
, klen
) && namelen
>= klen
+ ksuffixlen
&&
862 !memcmp(name
+ namelen
- ksuffixlen
, kstar
+ 1, ksuffixlen
);
864 struct strbuf sb
= STRBUF_INIT
;
865 const char *vstar
= strchr(value
, '*');
867 die("Value '%s' of pattern has no '*'", value
);
868 strbuf_add(&sb
, value
, vstar
- value
);
869 strbuf_add(&sb
, name
+ klen
, namelen
- klen
- ksuffixlen
);
870 strbuf_addstr(&sb
, vstar
+ 1);
871 *result
= strbuf_detach(&sb
, NULL
);
876 static void query_refspecs_multiple(struct refspec
*refs
, int ref_count
, struct refspec
*query
, struct string_list
*results
)
879 int find_src
= !query
->src
;
881 if (find_src
&& !query
->dst
)
882 error("query_refspecs_multiple: need either src or dst");
884 for (i
= 0; i
< ref_count
; i
++) {
885 struct refspec
*refspec
= &refs
[i
];
886 const char *key
= find_src
? refspec
->dst
: refspec
->src
;
887 const char *value
= find_src
? refspec
->src
: refspec
->dst
;
888 const char *needle
= find_src
? query
->dst
: query
->src
;
889 char **result
= find_src
? &query
->src
: &query
->dst
;
893 if (refspec
->pattern
) {
894 if (match_name_with_pattern(key
, needle
, value
, result
))
895 string_list_append_nodup(results
, *result
);
896 } else if (!strcmp(needle
, key
)) {
897 string_list_append(results
, value
);
902 int query_refspecs(struct refspec
*refs
, int ref_count
, struct refspec
*query
)
905 int find_src
= !query
->src
;
906 const char *needle
= find_src
? query
->dst
: query
->src
;
907 char **result
= find_src
? &query
->src
: &query
->dst
;
909 if (find_src
&& !query
->dst
)
910 return error("query_refspecs: need either src or dst");
912 for (i
= 0; i
< ref_count
; i
++) {
913 struct refspec
*refspec
= &refs
[i
];
914 const char *key
= find_src
? refspec
->dst
: refspec
->src
;
915 const char *value
= find_src
? refspec
->src
: refspec
->dst
;
919 if (refspec
->pattern
) {
920 if (match_name_with_pattern(key
, needle
, value
, result
)) {
921 query
->force
= refspec
->force
;
924 } else if (!strcmp(needle
, key
)) {
925 *result
= xstrdup(value
);
926 query
->force
= refspec
->force
;
933 char *apply_refspecs(struct refspec
*refspecs
, int nr_refspec
,
936 struct refspec query
;
938 memset(&query
, 0, sizeof(struct refspec
));
939 query
.src
= (char *)name
;
941 if (query_refspecs(refspecs
, nr_refspec
, &query
))
947 int remote_find_tracking(struct remote
*remote
, struct refspec
*refspec
)
949 return query_refspecs(remote
->fetch
, remote
->fetch_refspec_nr
, refspec
);
952 static struct ref
*alloc_ref_with_prefix(const char *prefix
, size_t prefixlen
,
955 size_t len
= strlen(name
);
956 struct ref
*ref
= xcalloc(1, st_add4(sizeof(*ref
), prefixlen
, len
, 1));
957 memcpy(ref
->name
, prefix
, prefixlen
);
958 memcpy(ref
->name
+ prefixlen
, name
, len
);
962 struct ref
*alloc_ref(const char *name
)
964 return alloc_ref_with_prefix("", 0, name
);
967 struct ref
*copy_ref(const struct ref
*ref
)
973 len
= st_add3(sizeof(struct ref
), strlen(ref
->name
), 1);
975 memcpy(cpy
, ref
, len
);
977 cpy
->symref
= xstrdup_or_null(ref
->symref
);
978 cpy
->remote_status
= xstrdup_or_null(ref
->remote_status
);
979 cpy
->peer_ref
= copy_ref(ref
->peer_ref
);
983 struct ref
*copy_ref_list(const struct ref
*ref
)
985 struct ref
*ret
= NULL
;
986 struct ref
**tail
= &ret
;
988 *tail
= copy_ref(ref
);
990 tail
= &((*tail
)->next
);
995 static void free_ref(struct ref
*ref
)
999 free_ref(ref
->peer_ref
);
1000 free(ref
->remote_status
);
1005 void free_refs(struct ref
*ref
)
1015 int ref_compare_name(const void *va
, const void *vb
)
1017 const struct ref
*a
= va
, *b
= vb
;
1018 return strcmp(a
->name
, b
->name
);
1021 static void *ref_list_get_next(const void *a
)
1023 return ((const struct ref
*)a
)->next
;
1026 static void ref_list_set_next(void *a
, void *next
)
1028 ((struct ref
*)a
)->next
= next
;
1031 void sort_ref_list(struct ref
**l
, int (*cmp
)(const void *, const void *))
1033 *l
= llist_mergesort(*l
, ref_list_get_next
, ref_list_set_next
, cmp
);
1036 int count_refspec_match(const char *pattern
,
1038 struct ref
**matched_ref
)
1040 int patlen
= strlen(pattern
);
1041 struct ref
*matched_weak
= NULL
;
1042 struct ref
*matched
= NULL
;
1046 for (weak_match
= match
= 0; refs
; refs
= refs
->next
) {
1047 char *name
= refs
->name
;
1048 int namelen
= strlen(name
);
1050 if (!refname_match(pattern
, name
))
1053 /* A match is "weak" if it is with refs outside
1054 * heads or tags, and did not specify the pattern
1055 * in full (e.g. "refs/remotes/origin/master") or at
1056 * least from the toplevel (e.g. "remotes/origin/master");
1057 * otherwise "git push $URL master" would result in
1058 * ambiguity between remotes/origin/master and heads/master
1059 * at the remote site.
1061 if (namelen
!= patlen
&&
1062 patlen
!= namelen
- 5 &&
1063 !starts_with(name
, "refs/heads/") &&
1064 !starts_with(name
, "refs/tags/")) {
1065 /* We want to catch the case where only weak
1066 * matches are found and there are multiple
1067 * matches, and where more than one strong
1068 * matches are found, as ambiguous. One
1069 * strong match with zero or more weak matches
1070 * are acceptable as a unique match.
1072 matched_weak
= refs
;
1082 *matched_ref
= matched_weak
;
1087 *matched_ref
= matched
;
1092 static void tail_link_ref(struct ref
*ref
, struct ref
***tail
)
1100 static struct ref
*alloc_delete_ref(void)
1102 struct ref
*ref
= alloc_ref("(delete)");
1103 oidclr(&ref
->new_oid
);
1107 static int try_explicit_object_name(const char *name
,
1110 struct object_id oid
;
1114 *match
= alloc_delete_ref();
1118 if (get_oid(name
, &oid
))
1122 *match
= alloc_ref(name
);
1123 oidcpy(&(*match
)->new_oid
, &oid
);
1128 static struct ref
*make_linked_ref(const char *name
, struct ref
***tail
)
1130 struct ref
*ret
= alloc_ref(name
);
1131 tail_link_ref(ret
, tail
);
1135 static char *guess_ref(const char *name
, struct ref
*peer
)
1137 struct strbuf buf
= STRBUF_INIT
;
1139 const char *r
= resolve_ref_unsafe(peer
->name
, RESOLVE_REF_READING
,
1144 if (starts_with(r
, "refs/heads/"))
1145 strbuf_addstr(&buf
, "refs/heads/");
1146 else if (starts_with(r
, "refs/tags/"))
1147 strbuf_addstr(&buf
, "refs/tags/");
1151 strbuf_addstr(&buf
, name
);
1152 return strbuf_detach(&buf
, NULL
);
1155 static int match_explicit_lhs(struct ref
*src
,
1158 int *allocated_match
)
1160 switch (count_refspec_match(rs
->src
, src
, match
)) {
1162 if (allocated_match
)
1163 *allocated_match
= 0;
1166 /* The source could be in the get_sha1() format
1167 * not a reference name. :refs/other is a
1168 * way to delete 'other' ref at the remote end.
1170 if (try_explicit_object_name(rs
->src
, match
) < 0)
1171 return error("src refspec %s does not match any.", rs
->src
);
1172 if (allocated_match
)
1173 *allocated_match
= 1;
1176 return error("src refspec %s matches more than one.", rs
->src
);
1180 static int match_explicit(struct ref
*src
, struct ref
*dst
,
1181 struct ref
***dst_tail
,
1184 struct ref
*matched_src
, *matched_dst
;
1187 const char *dst_value
= rs
->dst
;
1190 if (rs
->pattern
|| rs
->matching
)
1193 matched_src
= matched_dst
= NULL
;
1194 if (match_explicit_lhs(src
, rs
, &matched_src
, &allocated_src
) < 0)
1200 dst_value
= resolve_ref_unsafe(matched_src
->name
,
1201 RESOLVE_REF_READING
,
1204 ((flag
& REF_ISSYMREF
) &&
1205 !starts_with(dst_value
, "refs/heads/")))
1206 die("%s cannot be resolved to branch.",
1210 switch (count_refspec_match(dst_value
, dst
, &matched_dst
)) {
1214 if (starts_with(dst_value
, "refs/"))
1215 matched_dst
= make_linked_ref(dst_value
, dst_tail
);
1216 else if (is_null_oid(&matched_src
->new_oid
))
1217 error("unable to delete '%s': remote ref does not exist",
1219 else if ((dst_guess
= guess_ref(dst_value
, matched_src
))) {
1220 matched_dst
= make_linked_ref(dst_guess
, dst_tail
);
1223 error("unable to push to unqualified destination: %s\n"
1224 "The destination refspec neither matches an "
1225 "existing ref on the remote nor\n"
1226 "begins with refs/, and we are unable to "
1227 "guess a prefix based on the source ref.",
1232 error("dst refspec %s matches more than one.",
1238 if (matched_dst
->peer_ref
)
1239 return error("dst ref %s receives from more than one src.",
1242 matched_dst
->peer_ref
= allocated_src
?
1244 copy_ref(matched_src
);
1245 matched_dst
->force
= rs
->force
;
1250 static int match_explicit_refs(struct ref
*src
, struct ref
*dst
,
1251 struct ref
***dst_tail
, struct refspec
*rs
,
1255 for (i
= errs
= 0; i
< rs_nr
; i
++)
1256 errs
+= match_explicit(src
, dst
, dst_tail
, &rs
[i
]);
1260 static char *get_ref_match(const struct refspec
*rs
, int rs_nr
, const struct ref
*ref
,
1261 int send_mirror
, int direction
, const struct refspec
**ret_pat
)
1263 const struct refspec
*pat
;
1266 int matching_refs
= -1;
1267 for (i
= 0; i
< rs_nr
; i
++) {
1268 if (rs
[i
].matching
&&
1269 (matching_refs
== -1 || rs
[i
].force
)) {
1274 if (rs
[i
].pattern
) {
1275 const char *dst_side
= rs
[i
].dst
? rs
[i
].dst
: rs
[i
].src
;
1277 if (direction
== FROM_SRC
)
1278 match
= match_name_with_pattern(rs
[i
].src
, ref
->name
, dst_side
, &name
);
1280 match
= match_name_with_pattern(dst_side
, ref
->name
, rs
[i
].src
, &name
);
1287 if (matching_refs
== -1)
1290 pat
= rs
+ matching_refs
;
1291 if (pat
->matching
) {
1293 * "matching refs"; traditionally we pushed everything
1294 * including refs outside refs/heads/ hierarchy, but
1295 * that does not make much sense these days.
1297 if (!send_mirror
&& !starts_with(ref
->name
, "refs/heads/"))
1299 name
= xstrdup(ref
->name
);
1306 static struct ref
**tail_ref(struct ref
**head
)
1308 struct ref
**tail
= head
;
1310 tail
= &((*tail
)->next
);
1315 struct commit
**tip
;
1319 static void add_to_tips(struct tips
*tips
, const struct object_id
*oid
)
1321 struct commit
*commit
;
1323 if (is_null_oid(oid
))
1325 commit
= lookup_commit_reference_gently(oid
, 1);
1326 if (!commit
|| (commit
->object
.flags
& TMP_MARK
))
1328 commit
->object
.flags
|= TMP_MARK
;
1329 ALLOC_GROW(tips
->tip
, tips
->nr
+ 1, tips
->alloc
);
1330 tips
->tip
[tips
->nr
++] = commit
;
1333 static void add_missing_tags(struct ref
*src
, struct ref
**dst
, struct ref
***dst_tail
)
1335 struct string_list dst_tag
= STRING_LIST_INIT_NODUP
;
1336 struct string_list src_tag
= STRING_LIST_INIT_NODUP
;
1337 struct string_list_item
*item
;
1339 struct tips sent_tips
;
1342 * Collect everything we know they would have at the end of
1343 * this push, and collect all tags they have.
1345 memset(&sent_tips
, 0, sizeof(sent_tips
));
1346 for (ref
= *dst
; ref
; ref
= ref
->next
) {
1347 if (ref
->peer_ref
&&
1348 !is_null_oid(&ref
->peer_ref
->new_oid
))
1349 add_to_tips(&sent_tips
, &ref
->peer_ref
->new_oid
);
1351 add_to_tips(&sent_tips
, &ref
->old_oid
);
1352 if (starts_with(ref
->name
, "refs/tags/"))
1353 string_list_append(&dst_tag
, ref
->name
);
1355 clear_commit_marks_many(sent_tips
.nr
, sent_tips
.tip
, TMP_MARK
);
1357 string_list_sort(&dst_tag
);
1359 /* Collect tags they do not have. */
1360 for (ref
= src
; ref
; ref
= ref
->next
) {
1361 if (!starts_with(ref
->name
, "refs/tags/"))
1362 continue; /* not a tag */
1363 if (string_list_has_string(&dst_tag
, ref
->name
))
1364 continue; /* they already have it */
1365 if (sha1_object_info(ref
->new_oid
.hash
, NULL
) != OBJ_TAG
)
1366 continue; /* be conservative */
1367 item
= string_list_append(&src_tag
, ref
->name
);
1370 string_list_clear(&dst_tag
, 0);
1373 * At this point, src_tag lists tags that are missing from
1374 * dst, and sent_tips lists the tips we are pushing or those
1375 * that we know they already have. An element in the src_tag
1376 * that is an ancestor of any of the sent_tips needs to be
1377 * sent to the other side.
1380 for_each_string_list_item(item
, &src_tag
) {
1381 struct ref
*ref
= item
->util
;
1382 struct ref
*dst_ref
;
1383 struct commit
*commit
;
1385 if (is_null_oid(&ref
->new_oid
))
1387 commit
= lookup_commit_reference_gently(&ref
->new_oid
,
1390 /* not pushing a commit, which is not an error */
1394 * Is this tag, which they do not have, reachable from
1395 * any of the commits we are sending?
1397 if (!in_merge_bases_many(commit
, sent_tips
.nr
, sent_tips
.tip
))
1401 dst_ref
= make_linked_ref(ref
->name
, dst_tail
);
1402 oidcpy(&dst_ref
->new_oid
, &ref
->new_oid
);
1403 dst_ref
->peer_ref
= copy_ref(ref
);
1406 string_list_clear(&src_tag
, 0);
1407 free(sent_tips
.tip
);
1410 struct ref
*find_ref_by_name(const struct ref
*list
, const char *name
)
1412 for ( ; list
; list
= list
->next
)
1413 if (!strcmp(list
->name
, name
))
1414 return (struct ref
*)list
;
1418 static void prepare_ref_index(struct string_list
*ref_index
, struct ref
*ref
)
1420 for ( ; ref
; ref
= ref
->next
)
1421 string_list_append_nodup(ref_index
, ref
->name
)->util
= ref
;
1423 string_list_sort(ref_index
);
1427 * Given only the set of local refs, sanity-check the set of push
1428 * refspecs. We can't catch all errors that match_push_refs would,
1429 * but we can catch some errors early before even talking to the
1432 int check_push_refs(struct ref
*src
, int nr_refspec
, const char **refspec_names
)
1434 struct refspec
*refspec
= parse_push_refspec(nr_refspec
, refspec_names
);
1438 for (i
= 0; i
< nr_refspec
; i
++) {
1439 struct refspec
*rs
= refspec
+ i
;
1441 if (rs
->pattern
|| rs
->matching
)
1444 ret
|= match_explicit_lhs(src
, rs
, NULL
, NULL
);
1447 free_refspec(nr_refspec
, refspec
);
1452 * Given the set of refs the local repository has, the set of refs the
1453 * remote repository has, and the refspec used for push, determine
1454 * what remote refs we will update and with what value by setting
1455 * peer_ref (which object is being pushed) and force (if the push is
1456 * forced) in elements of "dst". The function may add new elements to
1457 * dst (e.g. pushing to a new branch, done in match_explicit_refs).
1459 int match_push_refs(struct ref
*src
, struct ref
**dst
,
1460 int nr_refspec
, const char **refspec
, int flags
)
1463 int send_all
= flags
& MATCH_REFS_ALL
;
1464 int send_mirror
= flags
& MATCH_REFS_MIRROR
;
1465 int send_prune
= flags
& MATCH_REFS_PRUNE
;
1467 static const char *default_refspec
[] = { ":", NULL
};
1468 struct ref
*ref
, **dst_tail
= tail_ref(dst
);
1469 struct string_list dst_ref_index
= STRING_LIST_INIT_NODUP
;
1473 refspec
= default_refspec
;
1475 rs
= parse_push_refspec(nr_refspec
, (const char **) refspec
);
1476 errs
= match_explicit_refs(src
, *dst
, &dst_tail
, rs
, nr_refspec
);
1478 /* pick the remainder */
1479 for (ref
= src
; ref
; ref
= ref
->next
) {
1480 struct string_list_item
*dst_item
;
1481 struct ref
*dst_peer
;
1482 const struct refspec
*pat
= NULL
;
1485 dst_name
= get_ref_match(rs
, nr_refspec
, ref
, send_mirror
, FROM_SRC
, &pat
);
1489 if (!dst_ref_index
.nr
)
1490 prepare_ref_index(&dst_ref_index
, *dst
);
1492 dst_item
= string_list_lookup(&dst_ref_index
, dst_name
);
1493 dst_peer
= dst_item
? dst_item
->util
: NULL
;
1495 if (dst_peer
->peer_ref
)
1496 /* We're already sending something to this ref. */
1499 if (pat
->matching
&& !(send_all
|| send_mirror
))
1501 * Remote doesn't have it, and we have no
1502 * explicit pattern, and we don't have
1503 * --all or --mirror.
1507 /* Create a new one and link it */
1508 dst_peer
= make_linked_ref(dst_name
, &dst_tail
);
1509 oidcpy(&dst_peer
->new_oid
, &ref
->new_oid
);
1510 string_list_insert(&dst_ref_index
,
1511 dst_peer
->name
)->util
= dst_peer
;
1513 dst_peer
->peer_ref
= copy_ref(ref
);
1514 dst_peer
->force
= pat
->force
;
1519 string_list_clear(&dst_ref_index
, 0);
1521 if (flags
& MATCH_REFS_FOLLOW_TAGS
)
1522 add_missing_tags(src
, dst
, &dst_tail
);
1525 struct string_list src_ref_index
= STRING_LIST_INIT_NODUP
;
1526 /* check for missing refs on the remote */
1527 for (ref
= *dst
; ref
; ref
= ref
->next
) {
1531 /* We're already sending something to this ref. */
1534 src_name
= get_ref_match(rs
, nr_refspec
, ref
, send_mirror
, FROM_DST
, NULL
);
1536 if (!src_ref_index
.nr
)
1537 prepare_ref_index(&src_ref_index
, src
);
1538 if (!string_list_has_string(&src_ref_index
,
1540 ref
->peer_ref
= alloc_delete_ref();
1544 string_list_clear(&src_ref_index
, 0);
1551 void set_ref_status_for_push(struct ref
*remote_refs
, int send_mirror
,
1556 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
1557 int force_ref_update
= ref
->force
|| force_update
;
1558 int reject_reason
= 0;
1561 oidcpy(&ref
->new_oid
, &ref
->peer_ref
->new_oid
);
1562 else if (!send_mirror
)
1565 ref
->deletion
= is_null_oid(&ref
->new_oid
);
1566 if (!ref
->deletion
&&
1567 !oidcmp(&ref
->old_oid
, &ref
->new_oid
)) {
1568 ref
->status
= REF_STATUS_UPTODATE
;
1573 * If the remote ref has moved and is now different
1574 * from what we expect, reject any push.
1576 * It also is an error if the user told us to check
1577 * with the remote-tracking branch to find the value
1578 * to expect, but we did not have such a tracking
1581 if (ref
->expect_old_sha1
) {
1582 if (oidcmp(&ref
->old_oid
, &ref
->old_oid_expect
))
1583 reject_reason
= REF_STATUS_REJECT_STALE
;
1585 /* If the ref isn't stale then force the update. */
1586 force_ref_update
= 1;
1590 * If the update isn't already rejected then check
1591 * the usual "must fast-forward" rules.
1593 * Decide whether an individual refspec A:B can be
1594 * pushed. The push will succeed if any of the
1595 * following are true:
1597 * (1) the remote reference B does not exist
1599 * (2) the remote reference B is being removed (i.e.,
1600 * pushing :B where no source is specified)
1602 * (3) the destination is not under refs/tags/, and
1603 * if the old and new value is a commit, the new
1604 * is a descendant of the old.
1606 * (4) it is forced using the +A:B notation, or by
1607 * passing the --force argument
1610 if (!reject_reason
&& !ref
->deletion
&& !is_null_oid(&ref
->old_oid
)) {
1611 if (starts_with(ref
->name
, "refs/tags/"))
1612 reject_reason
= REF_STATUS_REJECT_ALREADY_EXISTS
;
1613 else if (!has_object_file(&ref
->old_oid
))
1614 reject_reason
= REF_STATUS_REJECT_FETCH_FIRST
;
1615 else if (!lookup_commit_reference_gently(&ref
->old_oid
, 1) ||
1616 !lookup_commit_reference_gently(&ref
->new_oid
, 1))
1617 reject_reason
= REF_STATUS_REJECT_NEEDS_FORCE
;
1618 else if (!ref_newer(&ref
->new_oid
, &ref
->old_oid
))
1619 reject_reason
= REF_STATUS_REJECT_NONFASTFORWARD
;
1623 * "--force" will defeat any rejection implemented
1624 * by the rules above.
1626 if (!force_ref_update
)
1627 ref
->status
= reject_reason
;
1628 else if (reject_reason
)
1629 ref
->forced_update
= 1;
1633 static void set_merge(struct branch
*ret
)
1635 struct remote
*remote
;
1637 struct object_id oid
;
1641 return; /* no branch */
1643 return; /* already run */
1644 if (!ret
->remote_name
|| !ret
->merge_nr
) {
1646 * no merge config; let's make sure we don't confuse callers
1647 * with a non-zero merge_nr but a NULL merge
1653 remote
= remote_get(ret
->remote_name
);
1655 ret
->merge
= xcalloc(ret
->merge_nr
, sizeof(*ret
->merge
));
1656 for (i
= 0; i
< ret
->merge_nr
; i
++) {
1657 ret
->merge
[i
] = xcalloc(1, sizeof(**ret
->merge
));
1658 ret
->merge
[i
]->src
= xstrdup(ret
->merge_name
[i
]);
1659 if (!remote_find_tracking(remote
, ret
->merge
[i
]) ||
1660 strcmp(ret
->remote_name
, "."))
1662 if (dwim_ref(ret
->merge_name
[i
], strlen(ret
->merge_name
[i
]),
1664 ret
->merge
[i
]->dst
= ref
;
1666 ret
->merge
[i
]->dst
= xstrdup(ret
->merge_name
[i
]);
1670 struct branch
*branch_get(const char *name
)
1675 if (!name
|| !*name
|| !strcmp(name
, "HEAD"))
1676 ret
= current_branch
;
1678 ret
= make_branch(name
, 0);
1683 int branch_has_merge_config(struct branch
*branch
)
1685 return branch
&& !!branch
->merge
;
1688 int branch_merge_matches(struct branch
*branch
,
1690 const char *refname
)
1692 if (!branch
|| i
< 0 || i
>= branch
->merge_nr
)
1694 return refname_match(branch
->merge
[i
]->src
, refname
);
1697 __attribute__((format (printf
,2,3)))
1698 static const char *error_buf(struct strbuf
*err
, const char *fmt
, ...)
1703 strbuf_vaddf(err
, fmt
, ap
);
1709 const char *branch_get_upstream(struct branch
*branch
, struct strbuf
*err
)
1712 return error_buf(err
, _("HEAD does not point to a branch"));
1714 if (!branch
->merge
|| !branch
->merge
[0]) {
1716 * no merge config; is it because the user didn't define any,
1717 * or because it is not a real branch, and get_branch
1720 if (!ref_exists(branch
->refname
))
1721 return error_buf(err
, _("no such branch: '%s'"),
1723 return error_buf(err
,
1724 _("no upstream configured for branch '%s'"),
1728 if (!branch
->merge
[0]->dst
)
1729 return error_buf(err
,
1730 _("upstream branch '%s' not stored as a remote-tracking branch"),
1731 branch
->merge
[0]->src
);
1733 return branch
->merge
[0]->dst
;
1736 static const char *tracking_for_push_dest(struct remote
*remote
,
1737 const char *refname
,
1742 ret
= apply_refspecs(remote
->fetch
, remote
->fetch_refspec_nr
, refname
);
1744 return error_buf(err
,
1745 _("push destination '%s' on remote '%s' has no local tracking branch"),
1746 refname
, remote
->name
);
1750 static const char *branch_get_push_1(struct branch
*branch
, struct strbuf
*err
)
1752 struct remote
*remote
;
1754 remote
= remote_get(pushremote_for_branch(branch
, NULL
));
1756 return error_buf(err
,
1757 _("branch '%s' has no remote for pushing"),
1760 if (remote
->push_refspec_nr
) {
1764 dst
= apply_refspecs(remote
->push
, remote
->push_refspec_nr
,
1767 return error_buf(err
,
1768 _("push refspecs for '%s' do not include '%s'"),
1769 remote
->name
, branch
->name
);
1771 ret
= tracking_for_push_dest(remote
, dst
, err
);
1777 return tracking_for_push_dest(remote
, branch
->refname
, err
);
1779 switch (push_default
) {
1780 case PUSH_DEFAULT_NOTHING
:
1781 return error_buf(err
, _("push has no destination (push.default is 'nothing')"));
1783 case PUSH_DEFAULT_MATCHING
:
1784 case PUSH_DEFAULT_CURRENT
:
1785 return tracking_for_push_dest(remote
, branch
->refname
, err
);
1787 case PUSH_DEFAULT_UPSTREAM
:
1788 return branch_get_upstream(branch
, err
);
1790 case PUSH_DEFAULT_UNSPECIFIED
:
1791 case PUSH_DEFAULT_SIMPLE
:
1793 const char *up
, *cur
;
1795 up
= branch_get_upstream(branch
, err
);
1798 cur
= tracking_for_push_dest(remote
, branch
->refname
, err
);
1801 if (strcmp(cur
, up
))
1802 return error_buf(err
,
1803 _("cannot resolve 'simple' push to a single destination"));
1808 die("BUG: unhandled push situation");
1811 const char *branch_get_push(struct branch
*branch
, struct strbuf
*err
)
1814 return error_buf(err
, _("HEAD does not point to a branch"));
1816 if (!branch
->push_tracking_ref
)
1817 branch
->push_tracking_ref
= branch_get_push_1(branch
, err
);
1818 return branch
->push_tracking_ref
;
1821 static int ignore_symref_update(const char *refname
)
1825 if (!resolve_ref_unsafe(refname
, 0, NULL
, &flag
))
1826 return 0; /* non-existing refs are OK */
1827 return (flag
& REF_ISSYMREF
);
1831 * Create and return a list of (struct ref) consisting of copies of
1832 * each remote_ref that matches refspec. refspec must be a pattern.
1833 * Fill in the copies' peer_ref to describe the local tracking refs to
1834 * which they map. Omit any references that would map to an existing
1835 * local symbolic ref.
1837 static struct ref
*get_expanded_map(const struct ref
*remote_refs
,
1838 const struct refspec
*refspec
)
1840 const struct ref
*ref
;
1841 struct ref
*ret
= NULL
;
1842 struct ref
**tail
= &ret
;
1844 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
1845 char *expn_name
= NULL
;
1847 if (strchr(ref
->name
, '^'))
1848 continue; /* a dereference item */
1849 if (match_name_with_pattern(refspec
->src
, ref
->name
,
1850 refspec
->dst
, &expn_name
) &&
1851 !ignore_symref_update(expn_name
)) {
1852 struct ref
*cpy
= copy_ref(ref
);
1854 cpy
->peer_ref
= alloc_ref(expn_name
);
1856 cpy
->peer_ref
->force
= 1;
1866 static const struct ref
*find_ref_by_name_abbrev(const struct ref
*refs
, const char *name
)
1868 const struct ref
*ref
;
1869 for (ref
= refs
; ref
; ref
= ref
->next
) {
1870 if (refname_match(name
, ref
->name
))
1876 struct ref
*get_remote_ref(const struct ref
*remote_refs
, const char *name
)
1878 const struct ref
*ref
= find_ref_by_name_abbrev(remote_refs
, name
);
1883 return copy_ref(ref
);
1886 static struct ref
*get_local_ref(const char *name
)
1888 if (!name
|| name
[0] == '\0')
1891 if (starts_with(name
, "refs/"))
1892 return alloc_ref(name
);
1894 if (starts_with(name
, "heads/") ||
1895 starts_with(name
, "tags/") ||
1896 starts_with(name
, "remotes/"))
1897 return alloc_ref_with_prefix("refs/", 5, name
);
1899 return alloc_ref_with_prefix("refs/heads/", 11, name
);
1902 int get_fetch_map(const struct ref
*remote_refs
,
1903 const struct refspec
*refspec
,
1907 struct ref
*ref_map
, **rmp
;
1909 if (refspec
->pattern
) {
1910 ref_map
= get_expanded_map(remote_refs
, refspec
);
1912 const char *name
= refspec
->src
[0] ? refspec
->src
: "HEAD";
1914 if (refspec
->exact_sha1
) {
1915 ref_map
= alloc_ref(name
);
1916 get_oid_hex(name
, &ref_map
->old_oid
);
1918 ref_map
= get_remote_ref(remote_refs
, name
);
1920 if (!missing_ok
&& !ref_map
)
1921 die("Couldn't find remote ref %s", name
);
1923 ref_map
->peer_ref
= get_local_ref(refspec
->dst
);
1924 if (ref_map
->peer_ref
&& refspec
->force
)
1925 ref_map
->peer_ref
->force
= 1;
1929 for (rmp
= &ref_map
; *rmp
; ) {
1930 if ((*rmp
)->peer_ref
) {
1931 if (!starts_with((*rmp
)->peer_ref
->name
, "refs/") ||
1932 check_refname_format((*rmp
)->peer_ref
->name
, 0)) {
1933 struct ref
*ignore
= *rmp
;
1934 error("* Ignoring funny ref '%s' locally",
1935 (*rmp
)->peer_ref
->name
);
1936 *rmp
= (*rmp
)->next
;
1937 free(ignore
->peer_ref
);
1942 rmp
= &((*rmp
)->next
);
1946 tail_link_ref(ref_map
, tail
);
1951 int resolve_remote_symref(struct ref
*ref
, struct ref
*list
)
1955 for (; list
; list
= list
->next
)
1956 if (!strcmp(ref
->symref
, list
->name
)) {
1957 oidcpy(&ref
->old_oid
, &list
->old_oid
);
1963 static void unmark_and_free(struct commit_list
*list
, unsigned int mark
)
1966 struct commit
*commit
= pop_commit(&list
);
1967 commit
->object
.flags
&= ~mark
;
1971 int ref_newer(const struct object_id
*new_oid
, const struct object_id
*old_oid
)
1974 struct commit
*old
, *new;
1975 struct commit_list
*list
, *used
;
1979 * Both new and old must be commit-ish and new is descendant of
1980 * old. Otherwise we require --force.
1982 o
= deref_tag(parse_object(old_oid
), NULL
, 0);
1983 if (!o
|| o
->type
!= OBJ_COMMIT
)
1985 old
= (struct commit
*) o
;
1987 o
= deref_tag(parse_object(new_oid
), NULL
, 0);
1988 if (!o
|| o
->type
!= OBJ_COMMIT
)
1990 new = (struct commit
*) o
;
1992 if (parse_commit(new) < 0)
1996 commit_list_insert(new, &list
);
1998 new = pop_most_recent_commit(&list
, TMP_MARK
);
1999 commit_list_insert(new, &used
);
2005 unmark_and_free(list
, TMP_MARK
);
2006 unmark_and_free(used
, TMP_MARK
);
2011 * Compare a branch with its upstream, and save their differences (number
2012 * of commits) in *num_ours and *num_theirs. The name of the upstream branch
2013 * (or NULL if no upstream is defined) is returned via *upstream_name, if it
2014 * is not itself NULL.
2016 * Returns -1 if num_ours and num_theirs could not be filled in (e.g., no
2017 * upstream defined, or ref does not exist), 0 otherwise.
2019 int stat_tracking_info(struct branch
*branch
, int *num_ours
, int *num_theirs
,
2020 const char **upstream_name
)
2022 struct object_id oid
;
2023 struct commit
*ours
, *theirs
;
2024 struct rev_info revs
;
2026 struct argv_array argv
= ARGV_ARRAY_INIT
;
2028 /* Cannot stat unless we are marked to build on top of somebody else. */
2029 base
= branch_get_upstream(branch
, NULL
);
2031 *upstream_name
= base
;
2035 /* Cannot stat if what we used to build on no longer exists */
2036 if (read_ref(base
, &oid
))
2038 theirs
= lookup_commit_reference(&oid
);
2042 if (read_ref(branch
->refname
, &oid
))
2044 ours
= lookup_commit_reference(&oid
);
2048 /* are we the same? */
2049 if (theirs
== ours
) {
2050 *num_theirs
= *num_ours
= 0;
2054 /* Run "rev-list --left-right ours...theirs" internally... */
2055 argv_array_push(&argv
, ""); /* ignored */
2056 argv_array_push(&argv
, "--left-right");
2057 argv_array_pushf(&argv
, "%s...%s",
2058 oid_to_hex(&ours
->object
.oid
),
2059 oid_to_hex(&theirs
->object
.oid
));
2060 argv_array_push(&argv
, "--");
2062 init_revisions(&revs
, NULL
);
2063 setup_revisions(argv
.argc
, argv
.argv
, &revs
, NULL
);
2064 if (prepare_revision_walk(&revs
))
2065 die("revision walk setup failed");
2067 /* ... and count the commits on each side. */
2071 struct commit
*c
= get_revision(&revs
);
2074 if (c
->object
.flags
& SYMMETRIC_LEFT
)
2080 /* clear object flags smudged by the above traversal */
2081 clear_commit_marks(ours
, ALL_REV_FLAGS
);
2082 clear_commit_marks(theirs
, ALL_REV_FLAGS
);
2084 argv_array_clear(&argv
);
2089 * Return true when there is anything to report, otherwise false.
2091 int format_tracking_info(struct branch
*branch
, struct strbuf
*sb
)
2094 const char *full_base
;
2096 int upstream_is_gone
= 0;
2098 if (stat_tracking_info(branch
, &ours
, &theirs
, &full_base
) < 0) {
2101 upstream_is_gone
= 1;
2104 base
= shorten_unambiguous_ref(full_base
, 0);
2105 if (upstream_is_gone
) {
2107 _("Your branch is based on '%s', but the upstream is gone.\n"),
2109 if (advice_status_hints
)
2111 _(" (use \"git branch --unset-upstream\" to fixup)\n"));
2112 } else if (!ours
&& !theirs
) {
2114 _("Your branch is up to date with '%s'.\n"),
2116 } else if (!theirs
) {
2118 Q_("Your branch is ahead of '%s' by %d commit.\n",
2119 "Your branch is ahead of '%s' by %d commits.\n",
2122 if (advice_status_hints
)
2124 _(" (use \"git push\" to publish your local commits)\n"));
2127 Q_("Your branch is behind '%s' by %d commit, "
2128 "and can be fast-forwarded.\n",
2129 "Your branch is behind '%s' by %d commits, "
2130 "and can be fast-forwarded.\n",
2133 if (advice_status_hints
)
2135 _(" (use \"git pull\" to update your local branch)\n"));
2138 Q_("Your branch and '%s' have diverged,\n"
2139 "and have %d and %d different commit each, "
2141 "Your branch and '%s' have diverged,\n"
2142 "and have %d and %d different commits each, "
2145 base
, ours
, theirs
);
2146 if (advice_status_hints
)
2148 _(" (use \"git pull\" to merge the remote branch into yours)\n"));
2154 static int one_local_ref(const char *refname
, const struct object_id
*oid
,
2155 int flag
, void *cb_data
)
2157 struct ref
***local_tail
= cb_data
;
2160 /* we already know it starts with refs/ to get here */
2161 if (check_refname_format(refname
+ 5, 0))
2164 ref
= alloc_ref(refname
);
2165 oidcpy(&ref
->new_oid
, oid
);
2167 *local_tail
= &ref
->next
;
2171 struct ref
*get_local_heads(void)
2173 struct ref
*local_refs
= NULL
, **local_tail
= &local_refs
;
2175 for_each_ref(one_local_ref
, &local_tail
);
2179 struct ref
*guess_remote_head(const struct ref
*head
,
2180 const struct ref
*refs
,
2183 const struct ref
*r
;
2184 struct ref
*list
= NULL
;
2185 struct ref
**tail
= &list
;
2191 * Some transports support directly peeking at
2192 * where HEAD points; if that is the case, then
2193 * we don't have to guess.
2196 return copy_ref(find_ref_by_name(refs
, head
->symref
));
2198 /* If refs/heads/master could be right, it is. */
2200 r
= find_ref_by_name(refs
, "refs/heads/master");
2201 if (r
&& !oidcmp(&r
->old_oid
, &head
->old_oid
))
2205 /* Look for another ref that points there */
2206 for (r
= refs
; r
; r
= r
->next
) {
2208 starts_with(r
->name
, "refs/heads/") &&
2209 !oidcmp(&r
->old_oid
, &head
->old_oid
)) {
2210 *tail
= copy_ref(r
);
2211 tail
= &((*tail
)->next
);
2220 struct stale_heads_info
{
2221 struct string_list
*ref_names
;
2222 struct ref
**stale_refs_tail
;
2223 struct refspec
*refs
;
2227 static int get_stale_heads_cb(const char *refname
, const struct object_id
*oid
,
2228 int flags
, void *cb_data
)
2230 struct stale_heads_info
*info
= cb_data
;
2231 struct string_list matches
= STRING_LIST_INIT_DUP
;
2232 struct refspec query
;
2234 memset(&query
, 0, sizeof(struct refspec
));
2235 query
.dst
= (char *)refname
;
2237 query_refspecs_multiple(info
->refs
, info
->ref_count
, &query
, &matches
);
2238 if (matches
.nr
== 0)
2239 goto clean_exit
; /* No matches */
2242 * If we did find a suitable refspec and it's not a symref and
2243 * it's not in the list of refs that currently exist in that
2244 * remote, we consider it to be stale. In order to deal with
2245 * overlapping refspecs, we need to go over all of the
2248 if (flags
& REF_ISSYMREF
)
2251 for (i
= 0; stale
&& i
< matches
.nr
; i
++)
2252 if (string_list_has_string(info
->ref_names
, matches
.items
[i
].string
))
2256 struct ref
*ref
= make_linked_ref(refname
, &info
->stale_refs_tail
);
2257 oidcpy(&ref
->new_oid
, oid
);
2261 string_list_clear(&matches
, 0);
2265 struct ref
*get_stale_heads(struct refspec
*refs
, int ref_count
, struct ref
*fetch_map
)
2267 struct ref
*ref
, *stale_refs
= NULL
;
2268 struct string_list ref_names
= STRING_LIST_INIT_NODUP
;
2269 struct stale_heads_info info
;
2271 info
.ref_names
= &ref_names
;
2272 info
.stale_refs_tail
= &stale_refs
;
2274 info
.ref_count
= ref_count
;
2275 for (ref
= fetch_map
; ref
; ref
= ref
->next
)
2276 string_list_append(&ref_names
, ref
->name
);
2277 string_list_sort(&ref_names
);
2278 for_each_ref(get_stale_heads_cb
, &info
);
2279 string_list_clear(&ref_names
, 0);
2286 static void clear_cas_option(struct push_cas_option
*cas
)
2290 for (i
= 0; i
< cas
->nr
; i
++)
2291 free(cas
->entry
[i
].refname
);
2293 memset(cas
, 0, sizeof(*cas
));
2296 static struct push_cas
*add_cas_entry(struct push_cas_option
*cas
,
2297 const char *refname
,
2300 struct push_cas
*entry
;
2301 ALLOC_GROW(cas
->entry
, cas
->nr
+ 1, cas
->alloc
);
2302 entry
= &cas
->entry
[cas
->nr
++];
2303 memset(entry
, 0, sizeof(*entry
));
2304 entry
->refname
= xmemdupz(refname
, refnamelen
);
2308 static int parse_push_cas_option(struct push_cas_option
*cas
, const char *arg
, int unset
)
2311 struct push_cas
*entry
;
2314 /* "--no-<option>" */
2315 clear_cas_option(cas
);
2320 /* just "--<option>" */
2321 cas
->use_tracking_for_rest
= 1;
2325 /* "--<option>=refname" or "--<option>=refname:value" */
2326 colon
= strchrnul(arg
, ':');
2327 entry
= add_cas_entry(cas
, arg
, colon
- arg
);
2329 entry
->use_tracking
= 1;
2331 oidclr(&entry
->expect
);
2332 else if (get_oid(colon
+ 1, &entry
->expect
))
2333 return error("cannot parse expected object name '%s'", colon
+ 1);
2337 int parseopt_push_cas_option(const struct option
*opt
, const char *arg
, int unset
)
2339 return parse_push_cas_option(opt
->value
, arg
, unset
);
2342 int is_empty_cas(const struct push_cas_option
*cas
)
2344 return !cas
->use_tracking_for_rest
&& !cas
->nr
;
2348 * Look at remote.fetch refspec and see if we have a remote
2349 * tracking branch for the refname there. Fill its current
2351 * If we cannot do so, return negative to signal an error.
2353 static int remote_tracking(struct remote
*remote
, const char *refname
,
2354 struct object_id
*oid
)
2358 dst
= apply_refspecs(remote
->fetch
, remote
->fetch_refspec_nr
, refname
);
2360 return -1; /* no tracking ref for refname at remote */
2361 if (read_ref(dst
, oid
))
2362 return -1; /* we know what the tracking ref is but we cannot read it */
2366 static void apply_cas(struct push_cas_option
*cas
,
2367 struct remote
*remote
,
2372 /* Find an explicit --<option>=<name>[:<value>] entry */
2373 for (i
= 0; i
< cas
->nr
; i
++) {
2374 struct push_cas
*entry
= &cas
->entry
[i
];
2375 if (!refname_match(entry
->refname
, ref
->name
))
2377 ref
->expect_old_sha1
= 1;
2378 if (!entry
->use_tracking
)
2379 oidcpy(&ref
->old_oid_expect
, &entry
->expect
);
2380 else if (remote_tracking(remote
, ref
->name
, &ref
->old_oid_expect
))
2381 oidclr(&ref
->old_oid_expect
);
2385 /* Are we using "--<option>" to cover all? */
2386 if (!cas
->use_tracking_for_rest
)
2389 ref
->expect_old_sha1
= 1;
2390 if (remote_tracking(remote
, ref
->name
, &ref
->old_oid_expect
))
2391 oidclr(&ref
->old_oid_expect
);
2394 void apply_push_cas(struct push_cas_option
*cas
,
2395 struct remote
*remote
,
2396 struct ref
*remote_refs
)
2399 for (ref
= remote_refs
; ref
; ref
= ref
->next
)
2400 apply_cas(cas
, remote
, ref
);