9 #include "string-list.h"
10 #include "mergesort.h"
11 #include "argv-array.h"
13 enum map_direction
{ FROM_SRC
, FROM_DST
};
15 static struct refspec s_tag_refspec
= {
24 const struct refspec
*tag_refspec
= &s_tag_refspec
;
26 struct counted_string
{
33 struct counted_string
*instead_of
;
38 struct rewrite
**rewrite
;
43 static struct remote
**remotes
;
44 static int remotes_alloc
;
45 static int remotes_nr
;
46 static struct hashmap remotes_hash
;
48 static struct branch
**branches
;
49 static int branches_alloc
;
50 static int branches_nr
;
52 static struct branch
*current_branch
;
53 static const char *pushremote_name
;
55 static struct rewrites rewrites
;
56 static struct rewrites rewrites_push
;
58 static int valid_remote(const struct remote
*remote
)
60 return (!!remote
->url
) || (!!remote
->foreign_vcs
);
63 static const char *alias_url(const char *url
, struct rewrites
*r
)
66 struct counted_string
*longest
;
71 for (i
= 0; i
< r
->rewrite_nr
; i
++) {
74 for (j
= 0; j
< r
->rewrite
[i
]->instead_of_nr
; j
++) {
75 if (starts_with(url
, r
->rewrite
[i
]->instead_of
[j
].s
) &&
77 longest
->len
< r
->rewrite
[i
]->instead_of
[j
].len
)) {
78 longest
= &(r
->rewrite
[i
]->instead_of
[j
]);
86 return xstrfmt("%s%s", r
->rewrite
[longest_i
]->base
, url
+ longest
->len
);
89 static void add_push_refspec(struct remote
*remote
, const char *ref
)
91 ALLOC_GROW(remote
->push_refspec
,
92 remote
->push_refspec_nr
+ 1,
93 remote
->push_refspec_alloc
);
94 remote
->push_refspec
[remote
->push_refspec_nr
++] = ref
;
97 static void add_fetch_refspec(struct remote
*remote
, const char *ref
)
99 ALLOC_GROW(remote
->fetch_refspec
,
100 remote
->fetch_refspec_nr
+ 1,
101 remote
->fetch_refspec_alloc
);
102 remote
->fetch_refspec
[remote
->fetch_refspec_nr
++] = ref
;
105 static void add_url(struct remote
*remote
, const char *url
)
107 ALLOC_GROW(remote
->url
, remote
->url_nr
+ 1, remote
->url_alloc
);
108 remote
->url
[remote
->url_nr
++] = url
;
111 static void add_pushurl(struct remote
*remote
, const char *pushurl
)
113 ALLOC_GROW(remote
->pushurl
, remote
->pushurl_nr
+ 1, remote
->pushurl_alloc
);
114 remote
->pushurl
[remote
->pushurl_nr
++] = pushurl
;
117 static void add_pushurl_alias(struct remote
*remote
, const char *url
)
119 const char *pushurl
= alias_url(url
, &rewrites_push
);
121 add_pushurl(remote
, pushurl
);
124 static void add_url_alias(struct remote
*remote
, const char *url
)
126 add_url(remote
, alias_url(url
, &rewrites
));
127 add_pushurl_alias(remote
, url
);
130 struct remotes_hash_key
{
135 static int remotes_hash_cmp(const struct remote
*a
, const struct remote
*b
, const struct remotes_hash_key
*key
)
138 return strncmp(a
->name
, key
->str
, key
->len
) || a
->name
[key
->len
];
140 return strcmp(a
->name
, b
->name
);
143 static inline void init_remotes_hash(void)
145 if (!remotes_hash
.cmpfn
)
146 hashmap_init(&remotes_hash
, (hashmap_cmp_fn
)remotes_hash_cmp
, 0);
149 static struct remote
*make_remote(const char *name
, int len
)
151 struct remote
*ret
, *replaced
;
152 struct remotes_hash_key lookup
;
153 struct hashmap_entry lookup_entry
;
161 hashmap_entry_init(&lookup_entry
, memhash(name
, len
));
163 if ((ret
= hashmap_get(&remotes_hash
, &lookup_entry
, &lookup
)) != NULL
)
166 ret
= xcalloc(1, sizeof(struct remote
));
167 ret
->prune
= -1; /* unspecified */
168 ALLOC_GROW(remotes
, remotes_nr
+ 1, remotes_alloc
);
169 remotes
[remotes_nr
++] = ret
;
170 ret
->name
= xstrndup(name
, len
);
172 hashmap_entry_init(ret
, lookup_entry
.hash
);
173 replaced
= hashmap_put(&remotes_hash
, ret
);
174 assert(replaced
== NULL
); /* no previous entry overwritten */
178 static void add_merge(struct branch
*branch
, const char *name
)
180 ALLOC_GROW(branch
->merge_name
, branch
->merge_nr
+ 1,
181 branch
->merge_alloc
);
182 branch
->merge_name
[branch
->merge_nr
++] = name
;
185 static struct branch
*make_branch(const char *name
, int len
)
190 for (i
= 0; i
< branches_nr
; i
++) {
191 if (len
? (!strncmp(name
, branches
[i
]->name
, len
) &&
192 !branches
[i
]->name
[len
]) :
193 !strcmp(name
, branches
[i
]->name
))
197 ALLOC_GROW(branches
, branches_nr
+ 1, branches_alloc
);
198 ret
= xcalloc(1, sizeof(struct branch
));
199 branches
[branches_nr
++] = ret
;
201 ret
->name
= xstrndup(name
, len
);
203 ret
->name
= xstrdup(name
);
204 ret
->refname
= xstrfmt("refs/heads/%s", ret
->name
);
209 static struct rewrite
*make_rewrite(struct rewrites
*r
, const char *base
, int len
)
214 for (i
= 0; i
< r
->rewrite_nr
; i
++) {
216 ? (len
== r
->rewrite
[i
]->baselen
&&
217 !strncmp(base
, r
->rewrite
[i
]->base
, len
))
218 : !strcmp(base
, r
->rewrite
[i
]->base
))
219 return r
->rewrite
[i
];
222 ALLOC_GROW(r
->rewrite
, r
->rewrite_nr
+ 1, r
->rewrite_alloc
);
223 ret
= xcalloc(1, sizeof(struct rewrite
));
224 r
->rewrite
[r
->rewrite_nr
++] = ret
;
226 ret
->base
= xstrndup(base
, len
);
230 ret
->base
= xstrdup(base
);
231 ret
->baselen
= strlen(base
);
236 static void add_instead_of(struct rewrite
*rewrite
, const char *instead_of
)
238 ALLOC_GROW(rewrite
->instead_of
, rewrite
->instead_of_nr
+ 1, rewrite
->instead_of_alloc
);
239 rewrite
->instead_of
[rewrite
->instead_of_nr
].s
= instead_of
;
240 rewrite
->instead_of
[rewrite
->instead_of_nr
].len
= strlen(instead_of
);
241 rewrite
->instead_of_nr
++;
244 static const char *skip_spaces(const char *s
)
251 static void read_remotes_file(struct remote
*remote
)
253 struct strbuf buf
= STRBUF_INIT
;
254 FILE *f
= fopen(git_path("remotes/%s", remote
->name
), "r");
258 remote
->origin
= REMOTE_REMOTES
;
259 while (strbuf_getline(&buf
, f
, '\n') != EOF
) {
264 if (skip_prefix(buf
.buf
, "URL:", &v
))
265 add_url_alias(remote
, xstrdup(skip_spaces(v
)));
266 else if (skip_prefix(buf
.buf
, "Push:", &v
))
267 add_push_refspec(remote
, xstrdup(skip_spaces(v
)));
268 else if (skip_prefix(buf
.buf
, "Pull:", &v
))
269 add_fetch_refspec(remote
, xstrdup(skip_spaces(v
)));
271 strbuf_release(&buf
);
275 static void read_branches_file(struct remote
*remote
)
278 struct strbuf buf
= STRBUF_INIT
;
279 FILE *f
= fopen(git_path("branches/%s", remote
->name
), "r");
284 strbuf_getline(&buf
, f
, '\n');
288 strbuf_release(&buf
);
292 remote
->origin
= REMOTE_BRANCHES
;
295 * The branches file would have URL and optionally
296 * #branch specified. The "master" (or specified) branch is
297 * fetched and stored in the local branch matching the
300 frag
= strchr(buf
.buf
, '#');
306 add_url_alias(remote
, strbuf_detach(&buf
, NULL
));
307 add_fetch_refspec(remote
, xstrfmt("refs/heads/%s:refs/heads/%s",
308 frag
, remote
->name
));
311 * Cogito compatible push: push current HEAD to remote #branch
312 * (master if missing)
314 add_push_refspec(remote
, xstrfmt("HEAD:refs/heads/%s", frag
));
315 remote
->fetch_tags
= 1; /* always auto-follow */
318 static int handle_config(const char *key
, const char *value
, void *cb
)
322 struct remote
*remote
;
323 struct branch
*branch
;
324 if (starts_with(key
, "branch.")) {
326 subkey
= strrchr(name
, '.');
329 branch
= make_branch(name
, subkey
- name
);
330 if (!strcmp(subkey
, ".remote")) {
331 return git_config_string(&branch
->remote_name
, key
, value
);
332 } else if (!strcmp(subkey
, ".pushremote")) {
333 return git_config_string(&branch
->pushremote_name
, key
, value
);
334 } else if (!strcmp(subkey
, ".merge")) {
336 return config_error_nonbool(key
);
337 add_merge(branch
, xstrdup(value
));
341 if (starts_with(key
, "url.")) {
342 struct rewrite
*rewrite
;
344 subkey
= strrchr(name
, '.');
347 if (!strcmp(subkey
, ".insteadof")) {
348 rewrite
= make_rewrite(&rewrites
, name
, subkey
- name
);
350 return config_error_nonbool(key
);
351 add_instead_of(rewrite
, xstrdup(value
));
352 } else if (!strcmp(subkey
, ".pushinsteadof")) {
353 rewrite
= make_rewrite(&rewrites_push
, name
, subkey
- name
);
355 return config_error_nonbool(key
);
356 add_instead_of(rewrite
, xstrdup(value
));
360 if (!starts_with(key
, "remote."))
364 /* Handle remote.* variables */
365 if (!strcmp(name
, "pushdefault"))
366 return git_config_string(&pushremote_name
, key
, value
);
368 /* Handle remote.<name>.* variables */
370 warning("Config remote shorthand cannot begin with '/': %s",
374 subkey
= strrchr(name
, '.');
377 remote
= make_remote(name
, subkey
- name
);
378 remote
->origin
= REMOTE_CONFIG
;
379 if (!strcmp(subkey
, ".mirror"))
380 remote
->mirror
= git_config_bool(key
, value
);
381 else if (!strcmp(subkey
, ".skipdefaultupdate"))
382 remote
->skip_default_update
= git_config_bool(key
, value
);
383 else if (!strcmp(subkey
, ".skipfetchall"))
384 remote
->skip_default_update
= git_config_bool(key
, value
);
385 else if (!strcmp(subkey
, ".prune"))
386 remote
->prune
= git_config_bool(key
, value
);
387 else if (!strcmp(subkey
, ".url")) {
389 if (git_config_string(&v
, key
, value
))
392 } else if (!strcmp(subkey
, ".pushurl")) {
394 if (git_config_string(&v
, key
, value
))
396 add_pushurl(remote
, v
);
397 } else if (!strcmp(subkey
, ".push")) {
399 if (git_config_string(&v
, key
, value
))
401 add_push_refspec(remote
, v
);
402 } else if (!strcmp(subkey
, ".fetch")) {
404 if (git_config_string(&v
, key
, value
))
406 add_fetch_refspec(remote
, v
);
407 } else if (!strcmp(subkey
, ".receivepack")) {
409 if (git_config_string(&v
, key
, value
))
411 if (!remote
->receivepack
)
412 remote
->receivepack
= v
;
414 error("more than one receivepack given, using the first");
415 } else if (!strcmp(subkey
, ".uploadpack")) {
417 if (git_config_string(&v
, key
, value
))
419 if (!remote
->uploadpack
)
420 remote
->uploadpack
= v
;
422 error("more than one uploadpack given, using the first");
423 } else if (!strcmp(subkey
, ".tagopt")) {
424 if (!strcmp(value
, "--no-tags"))
425 remote
->fetch_tags
= -1;
426 else if (!strcmp(value
, "--tags"))
427 remote
->fetch_tags
= 2;
428 } else if (!strcmp(subkey
, ".proxy")) {
429 return git_config_string((const char **)&remote
->http_proxy
,
431 } else if (!strcmp(subkey
, ".vcs")) {
432 return git_config_string(&remote
->foreign_vcs
, key
, value
);
437 static void alias_all_urls(void)
440 for (i
= 0; i
< remotes_nr
; i
++) {
441 int add_pushurl_aliases
;
444 for (j
= 0; j
< remotes
[i
]->pushurl_nr
; j
++) {
445 remotes
[i
]->pushurl
[j
] = alias_url(remotes
[i
]->pushurl
[j
], &rewrites
);
447 add_pushurl_aliases
= remotes
[i
]->pushurl_nr
== 0;
448 for (j
= 0; j
< remotes
[i
]->url_nr
; j
++) {
449 if (add_pushurl_aliases
)
450 add_pushurl_alias(remotes
[i
], remotes
[i
]->url
[j
]);
451 remotes
[i
]->url
[j
] = alias_url(remotes
[i
]->url
[j
], &rewrites
);
456 static void read_config(void)
459 unsigned char sha1
[20];
460 const char *head_ref
;
467 current_branch
= NULL
;
468 head_ref
= resolve_ref_unsafe("HEAD", 0, sha1
, &flag
);
469 if (head_ref
&& (flag
& REF_ISSYMREF
) &&
470 skip_prefix(head_ref
, "refs/heads/", &head_ref
)) {
471 current_branch
= make_branch(head_ref
, 0);
473 git_config(handle_config
, NULL
);
478 * This function frees a refspec array.
479 * Warning: code paths should be checked to ensure that the src
480 * and dst pointers are always freeable pointers as well
481 * as the refspec pointer itself.
483 static void free_refspecs(struct refspec
*refspec
, int nr_refspec
)
490 for (i
= 0; i
< nr_refspec
; i
++) {
491 free(refspec
[i
].src
);
492 free(refspec
[i
].dst
);
497 static struct refspec
*parse_refspec_internal(int nr_refspec
, const char **refspec
, int fetch
, int verify
)
500 struct refspec
*rs
= xcalloc(nr_refspec
, sizeof(*rs
));
502 for (i
= 0; i
< nr_refspec
; i
++) {
505 const char *lhs
, *rhs
;
516 rhs
= strrchr(lhs
, ':');
519 * Before going on, special case ":" (or "+:") as a refspec
520 * for pushing matching refs.
522 if (!fetch
&& rhs
== lhs
&& rhs
[1] == '\0') {
528 size_t rlen
= strlen(++rhs
);
529 is_glob
= (1 <= rlen
&& strchr(rhs
, '*'));
530 rs
[i
].dst
= xstrndup(rhs
, rlen
);
533 llen
= (rhs
? (rhs
- lhs
- 1) : strlen(lhs
));
534 if (1 <= llen
&& memchr(lhs
, '*', llen
)) {
535 if ((rhs
&& !is_glob
) || (!rhs
&& fetch
))
538 } else if (rhs
&& is_glob
) {
542 rs
[i
].pattern
= is_glob
;
543 rs
[i
].src
= xstrndup(lhs
, llen
);
544 flags
= REFNAME_ALLOW_ONELEVEL
| (is_glob
? REFNAME_REFSPEC_PATTERN
: 0);
547 unsigned char unused
[40];
551 ; /* empty is ok; it means "HEAD" */
552 else if (llen
== 40 && !get_sha1_hex(rs
[i
].src
, unused
))
553 rs
[i
].exact_sha1
= 1; /* ok */
554 else if (!check_refname_format(rs
[i
].src
, flags
))
555 ; /* valid looking ref is ok */
560 ; /* missing is ok; it is the same as empty */
561 else if (!*rs
[i
].dst
)
562 ; /* empty is ok; it means "do not store" */
563 else if (!check_refname_format(rs
[i
].dst
, flags
))
564 ; /* valid looking ref is ok */
570 * - empty is allowed; it means delete.
571 * - when wildcarded, it must be a valid looking ref.
572 * - otherwise, it must be an extended SHA-1, but
573 * there is no existing way to validate this.
578 if (check_refname_format(rs
[i
].src
, flags
))
582 ; /* anything goes, for now */
585 * - missing is allowed, but LHS then must be a
587 * - empty is not allowed.
588 * - otherwise it must be a valid looking ref.
591 if (check_refname_format(rs
[i
].src
, flags
))
593 } else if (!*rs
[i
].dst
) {
596 if (check_refname_format(rs
[i
].dst
, flags
))
606 * nr_refspec must be greater than zero and i must be valid
607 * since it is only possible to reach this point from within
608 * the for loop above.
610 free_refspecs(rs
, i
+1);
613 die("Invalid refspec '%s'", refspec
[i
]);
616 int valid_fetch_refspec(const char *fetch_refspec_str
)
618 struct refspec
*refspec
;
620 refspec
= parse_refspec_internal(1, &fetch_refspec_str
, 1, 1);
621 free_refspecs(refspec
, 1);
625 struct refspec
*parse_fetch_refspec(int nr_refspec
, const char **refspec
)
627 return parse_refspec_internal(nr_refspec
, refspec
, 1, 0);
630 static struct refspec
*parse_push_refspec(int nr_refspec
, const char **refspec
)
632 return parse_refspec_internal(nr_refspec
, refspec
, 0, 0);
635 void free_refspec(int nr_refspec
, struct refspec
*refspec
)
638 for (i
= 0; i
< nr_refspec
; i
++) {
639 free(refspec
[i
].src
);
640 free(refspec
[i
].dst
);
645 static int valid_remote_nick(const char *name
)
647 if (!name
[0] || is_dot_or_dotdot(name
))
649 return !strchr(name
, '/'); /* no slash */
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
)) {
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(const char *name
)
720 struct remotes_hash_key lookup
;
721 struct hashmap_entry lookup_entry
;
726 lookup
.len
= strlen(name
);
727 hashmap_entry_init(&lookup_entry
, memhash(name
, lookup
.len
));
729 return hashmap_get(&remotes_hash
, &lookup_entry
, &lookup
) != NULL
;
732 int for_each_remote(each_remote_fn fn
, void *priv
)
736 for (i
= 0; i
< remotes_nr
&& !result
; i
++) {
737 struct remote
*r
= remotes
[i
];
741 r
->fetch
= parse_fetch_refspec(r
->fetch_refspec_nr
,
744 r
->push
= parse_push_refspec(r
->push_refspec_nr
,
746 result
= fn(r
, priv
);
751 static void handle_duplicate(struct ref
*ref1
, struct ref
*ref2
)
753 if (strcmp(ref1
->name
, ref2
->name
)) {
754 if (ref1
->fetch_head_status
!= FETCH_HEAD_IGNORE
&&
755 ref2
->fetch_head_status
!= FETCH_HEAD_IGNORE
) {
756 die(_("Cannot fetch both %s and %s to %s"),
757 ref1
->name
, ref2
->name
, ref2
->peer_ref
->name
);
758 } else if (ref1
->fetch_head_status
!= FETCH_HEAD_IGNORE
&&
759 ref2
->fetch_head_status
== FETCH_HEAD_IGNORE
) {
760 warning(_("%s usually tracks %s, not %s"),
761 ref2
->peer_ref
->name
, ref2
->name
, ref1
->name
);
762 } else if (ref1
->fetch_head_status
== FETCH_HEAD_IGNORE
&&
763 ref2
->fetch_head_status
== FETCH_HEAD_IGNORE
) {
764 die(_("%s tracks both %s and %s"),
765 ref2
->peer_ref
->name
, ref1
->name
, ref2
->name
);
768 * This last possibility doesn't occur because
769 * FETCH_HEAD_IGNORE entries always appear at
770 * the end of the list.
772 die(_("Internal error"));
775 free(ref2
->peer_ref
);
779 struct ref
*ref_remove_duplicates(struct ref
*ref_map
)
781 struct string_list refs
= STRING_LIST_INIT_NODUP
;
782 struct ref
*retval
= NULL
;
783 struct ref
**p
= &retval
;
786 struct ref
*ref
= ref_map
;
788 ref_map
= ref_map
->next
;
791 if (!ref
->peer_ref
) {
795 struct string_list_item
*item
=
796 string_list_insert(&refs
, ref
->peer_ref
->name
);
799 /* Entry already existed */
800 handle_duplicate((struct ref
*)item
->util
, ref
);
809 string_list_clear(&refs
, 0);
813 int remote_has_url(struct remote
*remote
, const char *url
)
816 for (i
= 0; i
< remote
->url_nr
; i
++) {
817 if (!strcmp(remote
->url
[i
], url
))
823 static int match_name_with_pattern(const char *key
, const char *name
,
824 const char *value
, char **result
)
826 const char *kstar
= strchr(key
, '*');
832 die("Key '%s' of pattern had no '*'", key
);
834 ksuffixlen
= strlen(kstar
+ 1);
835 namelen
= strlen(name
);
836 ret
= !strncmp(name
, key
, klen
) && namelen
>= klen
+ ksuffixlen
&&
837 !memcmp(name
+ namelen
- ksuffixlen
, kstar
+ 1, ksuffixlen
);
839 struct strbuf sb
= STRBUF_INIT
;
840 const char *vstar
= strchr(value
, '*');
842 die("Value '%s' of pattern has no '*'", value
);
843 strbuf_add(&sb
, value
, vstar
- value
);
844 strbuf_add(&sb
, name
+ klen
, namelen
- klen
- ksuffixlen
);
845 strbuf_addstr(&sb
, vstar
+ 1);
846 *result
= strbuf_detach(&sb
, NULL
);
851 static void query_refspecs_multiple(struct refspec
*refs
, int ref_count
, struct refspec
*query
, struct string_list
*results
)
854 int find_src
= !query
->src
;
856 if (find_src
&& !query
->dst
)
857 error("query_refspecs_multiple: need either src or dst");
859 for (i
= 0; i
< ref_count
; i
++) {
860 struct refspec
*refspec
= &refs
[i
];
861 const char *key
= find_src
? refspec
->dst
: refspec
->src
;
862 const char *value
= find_src
? refspec
->src
: refspec
->dst
;
863 const char *needle
= find_src
? query
->dst
: query
->src
;
864 char **result
= find_src
? &query
->src
: &query
->dst
;
868 if (refspec
->pattern
) {
869 if (match_name_with_pattern(key
, needle
, value
, result
))
870 string_list_append_nodup(results
, *result
);
871 } else if (!strcmp(needle
, key
)) {
872 string_list_append(results
, value
);
877 int query_refspecs(struct refspec
*refs
, int ref_count
, struct refspec
*query
)
880 int find_src
= !query
->src
;
881 const char *needle
= find_src
? query
->dst
: query
->src
;
882 char **result
= find_src
? &query
->src
: &query
->dst
;
884 if (find_src
&& !query
->dst
)
885 return error("query_refspecs: need either src or dst");
887 for (i
= 0; i
< ref_count
; i
++) {
888 struct refspec
*refspec
= &refs
[i
];
889 const char *key
= find_src
? refspec
->dst
: refspec
->src
;
890 const char *value
= find_src
? refspec
->src
: refspec
->dst
;
894 if (refspec
->pattern
) {
895 if (match_name_with_pattern(key
, needle
, value
, result
)) {
896 query
->force
= refspec
->force
;
899 } else if (!strcmp(needle
, key
)) {
900 *result
= xstrdup(value
);
901 query
->force
= refspec
->force
;
908 char *apply_refspecs(struct refspec
*refspecs
, int nr_refspec
,
911 struct refspec query
;
913 memset(&query
, 0, sizeof(struct refspec
));
914 query
.src
= (char *)name
;
916 if (query_refspecs(refspecs
, nr_refspec
, &query
))
922 int remote_find_tracking(struct remote
*remote
, struct refspec
*refspec
)
924 return query_refspecs(remote
->fetch
, remote
->fetch_refspec_nr
, refspec
);
927 static struct ref
*alloc_ref_with_prefix(const char *prefix
, size_t prefixlen
,
930 size_t len
= strlen(name
);
931 struct ref
*ref
= xcalloc(1, sizeof(struct ref
) + prefixlen
+ len
+ 1);
932 memcpy(ref
->name
, prefix
, prefixlen
);
933 memcpy(ref
->name
+ prefixlen
, name
, len
);
937 struct ref
*alloc_ref(const char *name
)
939 return alloc_ref_with_prefix("", 0, name
);
942 struct ref
*copy_ref(const struct ref
*ref
)
948 len
= strlen(ref
->name
);
949 cpy
= xmalloc(sizeof(struct ref
) + len
+ 1);
950 memcpy(cpy
, ref
, sizeof(struct ref
) + len
+ 1);
952 cpy
->symref
= xstrdup_or_null(ref
->symref
);
953 cpy
->remote_status
= xstrdup_or_null(ref
->remote_status
);
954 cpy
->peer_ref
= copy_ref(ref
->peer_ref
);
958 struct ref
*copy_ref_list(const struct ref
*ref
)
960 struct ref
*ret
= NULL
;
961 struct ref
**tail
= &ret
;
963 *tail
= copy_ref(ref
);
965 tail
= &((*tail
)->next
);
970 static void free_ref(struct ref
*ref
)
974 free_ref(ref
->peer_ref
);
975 free(ref
->remote_status
);
980 void free_refs(struct ref
*ref
)
990 int ref_compare_name(const void *va
, const void *vb
)
992 const struct ref
*a
= va
, *b
= vb
;
993 return strcmp(a
->name
, b
->name
);
996 static void *ref_list_get_next(const void *a
)
998 return ((const struct ref
*)a
)->next
;
1001 static void ref_list_set_next(void *a
, void *next
)
1003 ((struct ref
*)a
)->next
= next
;
1006 void sort_ref_list(struct ref
**l
, int (*cmp
)(const void *, const void *))
1008 *l
= llist_mergesort(*l
, ref_list_get_next
, ref_list_set_next
, cmp
);
1011 int count_refspec_match(const char *pattern
,
1013 struct ref
**matched_ref
)
1015 int patlen
= strlen(pattern
);
1016 struct ref
*matched_weak
= NULL
;
1017 struct ref
*matched
= NULL
;
1021 for (weak_match
= match
= 0; refs
; refs
= refs
->next
) {
1022 char *name
= refs
->name
;
1023 int namelen
= strlen(name
);
1025 if (!refname_match(pattern
, name
))
1028 /* A match is "weak" if it is with refs outside
1029 * heads or tags, and did not specify the pattern
1030 * in full (e.g. "refs/remotes/origin/master") or at
1031 * least from the toplevel (e.g. "remotes/origin/master");
1032 * otherwise "git push $URL master" would result in
1033 * ambiguity between remotes/origin/master and heads/master
1034 * at the remote site.
1036 if (namelen
!= patlen
&&
1037 patlen
!= namelen
- 5 &&
1038 !starts_with(name
, "refs/heads/") &&
1039 !starts_with(name
, "refs/tags/")) {
1040 /* We want to catch the case where only weak
1041 * matches are found and there are multiple
1042 * matches, and where more than one strong
1043 * matches are found, as ambiguous. One
1044 * strong match with zero or more weak matches
1045 * are acceptable as a unique match.
1047 matched_weak
= refs
;
1057 *matched_ref
= matched_weak
;
1062 *matched_ref
= matched
;
1067 static void tail_link_ref(struct ref
*ref
, struct ref
***tail
)
1075 static struct ref
*alloc_delete_ref(void)
1077 struct ref
*ref
= alloc_ref("(delete)");
1078 hashclr(ref
->new_sha1
);
1082 static int try_explicit_object_name(const char *name
,
1085 unsigned char sha1
[20];
1089 *match
= alloc_delete_ref();
1093 if (get_sha1(name
, sha1
))
1097 *match
= alloc_ref(name
);
1098 hashcpy((*match
)->new_sha1
, sha1
);
1103 static struct ref
*make_linked_ref(const char *name
, struct ref
***tail
)
1105 struct ref
*ret
= alloc_ref(name
);
1106 tail_link_ref(ret
, tail
);
1110 static char *guess_ref(const char *name
, struct ref
*peer
)
1112 struct strbuf buf
= STRBUF_INIT
;
1113 unsigned char sha1
[20];
1115 const char *r
= resolve_ref_unsafe(peer
->name
, RESOLVE_REF_READING
,
1120 if (starts_with(r
, "refs/heads/"))
1121 strbuf_addstr(&buf
, "refs/heads/");
1122 else if (starts_with(r
, "refs/tags/"))
1123 strbuf_addstr(&buf
, "refs/tags/");
1127 strbuf_addstr(&buf
, name
);
1128 return strbuf_detach(&buf
, NULL
);
1131 static int match_explicit_lhs(struct ref
*src
,
1134 int *allocated_match
)
1136 switch (count_refspec_match(rs
->src
, src
, match
)) {
1138 if (allocated_match
)
1139 *allocated_match
= 0;
1142 /* The source could be in the get_sha1() format
1143 * not a reference name. :refs/other is a
1144 * way to delete 'other' ref at the remote end.
1146 if (try_explicit_object_name(rs
->src
, match
) < 0)
1147 return error("src refspec %s does not match any.", rs
->src
);
1148 if (allocated_match
)
1149 *allocated_match
= 1;
1152 return error("src refspec %s matches more than one.", rs
->src
);
1156 static int match_explicit(struct ref
*src
, struct ref
*dst
,
1157 struct ref
***dst_tail
,
1160 struct ref
*matched_src
, *matched_dst
;
1163 const char *dst_value
= rs
->dst
;
1166 if (rs
->pattern
|| rs
->matching
)
1169 matched_src
= matched_dst
= NULL
;
1170 if (match_explicit_lhs(src
, rs
, &matched_src
, &allocated_src
) < 0)
1174 unsigned char sha1
[20];
1177 dst_value
= resolve_ref_unsafe(matched_src
->name
,
1178 RESOLVE_REF_READING
,
1181 ((flag
& REF_ISSYMREF
) &&
1182 !starts_with(dst_value
, "refs/heads/")))
1183 die("%s cannot be resolved to branch.",
1187 switch (count_refspec_match(dst_value
, dst
, &matched_dst
)) {
1191 if (starts_with(dst_value
, "refs/"))
1192 matched_dst
= make_linked_ref(dst_value
, dst_tail
);
1193 else if (is_null_sha1(matched_src
->new_sha1
))
1194 error("unable to delete '%s': remote ref does not exist",
1196 else if ((dst_guess
= guess_ref(dst_value
, matched_src
)))
1197 matched_dst
= make_linked_ref(dst_guess
, dst_tail
);
1199 error("unable to push to unqualified destination: %s\n"
1200 "The destination refspec neither matches an "
1201 "existing ref on the remote nor\n"
1202 "begins with refs/, and we are unable to "
1203 "guess a prefix based on the source ref.",
1208 error("dst refspec %s matches more than one.",
1214 if (matched_dst
->peer_ref
)
1215 return error("dst ref %s receives from more than one src.",
1218 matched_dst
->peer_ref
= allocated_src
?
1220 copy_ref(matched_src
);
1221 matched_dst
->force
= rs
->force
;
1226 static int match_explicit_refs(struct ref
*src
, struct ref
*dst
,
1227 struct ref
***dst_tail
, struct refspec
*rs
,
1231 for (i
= errs
= 0; i
< rs_nr
; i
++)
1232 errs
+= match_explicit(src
, dst
, dst_tail
, &rs
[i
]);
1236 static char *get_ref_match(const struct refspec
*rs
, int rs_nr
, const struct ref
*ref
,
1237 int send_mirror
, int direction
, const struct refspec
**ret_pat
)
1239 const struct refspec
*pat
;
1242 int matching_refs
= -1;
1243 for (i
= 0; i
< rs_nr
; i
++) {
1244 if (rs
[i
].matching
&&
1245 (matching_refs
== -1 || rs
[i
].force
)) {
1250 if (rs
[i
].pattern
) {
1251 const char *dst_side
= rs
[i
].dst
? rs
[i
].dst
: rs
[i
].src
;
1253 if (direction
== FROM_SRC
)
1254 match
= match_name_with_pattern(rs
[i
].src
, ref
->name
, dst_side
, &name
);
1256 match
= match_name_with_pattern(dst_side
, ref
->name
, rs
[i
].src
, &name
);
1263 if (matching_refs
== -1)
1266 pat
= rs
+ matching_refs
;
1267 if (pat
->matching
) {
1269 * "matching refs"; traditionally we pushed everything
1270 * including refs outside refs/heads/ hierarchy, but
1271 * that does not make much sense these days.
1273 if (!send_mirror
&& !starts_with(ref
->name
, "refs/heads/"))
1275 name
= xstrdup(ref
->name
);
1282 static struct ref
**tail_ref(struct ref
**head
)
1284 struct ref
**tail
= head
;
1286 tail
= &((*tail
)->next
);
1291 struct commit
**tip
;
1295 static void add_to_tips(struct tips
*tips
, const unsigned char *sha1
)
1297 struct commit
*commit
;
1299 if (is_null_sha1(sha1
))
1301 commit
= lookup_commit_reference_gently(sha1
, 1);
1302 if (!commit
|| (commit
->object
.flags
& TMP_MARK
))
1304 commit
->object
.flags
|= TMP_MARK
;
1305 ALLOC_GROW(tips
->tip
, tips
->nr
+ 1, tips
->alloc
);
1306 tips
->tip
[tips
->nr
++] = commit
;
1309 static void add_missing_tags(struct ref
*src
, struct ref
**dst
, struct ref
***dst_tail
)
1311 struct string_list dst_tag
= STRING_LIST_INIT_NODUP
;
1312 struct string_list src_tag
= STRING_LIST_INIT_NODUP
;
1313 struct string_list_item
*item
;
1315 struct tips sent_tips
;
1318 * Collect everything we know they would have at the end of
1319 * this push, and collect all tags they have.
1321 memset(&sent_tips
, 0, sizeof(sent_tips
));
1322 for (ref
= *dst
; ref
; ref
= ref
->next
) {
1323 if (ref
->peer_ref
&&
1324 !is_null_sha1(ref
->peer_ref
->new_sha1
))
1325 add_to_tips(&sent_tips
, ref
->peer_ref
->new_sha1
);
1327 add_to_tips(&sent_tips
, ref
->old_sha1
);
1328 if (starts_with(ref
->name
, "refs/tags/"))
1329 string_list_append(&dst_tag
, ref
->name
);
1331 clear_commit_marks_many(sent_tips
.nr
, sent_tips
.tip
, TMP_MARK
);
1333 string_list_sort(&dst_tag
);
1335 /* Collect tags they do not have. */
1336 for (ref
= src
; ref
; ref
= ref
->next
) {
1337 if (!starts_with(ref
->name
, "refs/tags/"))
1338 continue; /* not a tag */
1339 if (string_list_has_string(&dst_tag
, ref
->name
))
1340 continue; /* they already have it */
1341 if (sha1_object_info(ref
->new_sha1
, NULL
) != OBJ_TAG
)
1342 continue; /* be conservative */
1343 item
= string_list_append(&src_tag
, ref
->name
);
1346 string_list_clear(&dst_tag
, 0);
1349 * At this point, src_tag lists tags that are missing from
1350 * dst, and sent_tips lists the tips we are pushing or those
1351 * that we know they already have. An element in the src_tag
1352 * that is an ancestor of any of the sent_tips needs to be
1353 * sent to the other side.
1356 for_each_string_list_item(item
, &src_tag
) {
1357 struct ref
*ref
= item
->util
;
1358 struct ref
*dst_ref
;
1359 struct commit
*commit
;
1361 if (is_null_sha1(ref
->new_sha1
))
1363 commit
= lookup_commit_reference_gently(ref
->new_sha1
, 1);
1365 /* not pushing a commit, which is not an error */
1369 * Is this tag, which they do not have, reachable from
1370 * any of the commits we are sending?
1372 if (!in_merge_bases_many(commit
, sent_tips
.nr
, sent_tips
.tip
))
1376 dst_ref
= make_linked_ref(ref
->name
, dst_tail
);
1377 hashcpy(dst_ref
->new_sha1
, ref
->new_sha1
);
1378 dst_ref
->peer_ref
= copy_ref(ref
);
1381 string_list_clear(&src_tag
, 0);
1382 free(sent_tips
.tip
);
1385 struct ref
*find_ref_by_name(const struct ref
*list
, const char *name
)
1387 for ( ; list
; list
= list
->next
)
1388 if (!strcmp(list
->name
, name
))
1389 return (struct ref
*)list
;
1393 static void prepare_ref_index(struct string_list
*ref_index
, struct ref
*ref
)
1395 for ( ; ref
; ref
= ref
->next
)
1396 string_list_append_nodup(ref_index
, ref
->name
)->util
= ref
;
1398 string_list_sort(ref_index
);
1402 * Given only the set of local refs, sanity-check the set of push
1403 * refspecs. We can't catch all errors that match_push_refs would,
1404 * but we can catch some errors early before even talking to the
1407 int check_push_refs(struct ref
*src
, int nr_refspec
, const char **refspec_names
)
1409 struct refspec
*refspec
= parse_push_refspec(nr_refspec
, refspec_names
);
1413 for (i
= 0; i
< nr_refspec
; i
++) {
1414 struct refspec
*rs
= refspec
+ i
;
1416 if (rs
->pattern
|| rs
->matching
)
1419 ret
|= match_explicit_lhs(src
, rs
, NULL
, NULL
);
1422 free_refspec(nr_refspec
, refspec
);
1427 * Given the set of refs the local repository has, the set of refs the
1428 * remote repository has, and the refspec used for push, determine
1429 * what remote refs we will update and with what value by setting
1430 * peer_ref (which object is being pushed) and force (if the push is
1431 * forced) in elements of "dst". The function may add new elements to
1432 * dst (e.g. pushing to a new branch, done in match_explicit_refs).
1434 int match_push_refs(struct ref
*src
, struct ref
**dst
,
1435 int nr_refspec
, const char **refspec
, int flags
)
1438 int send_all
= flags
& MATCH_REFS_ALL
;
1439 int send_mirror
= flags
& MATCH_REFS_MIRROR
;
1440 int send_prune
= flags
& MATCH_REFS_PRUNE
;
1442 static const char *default_refspec
[] = { ":", NULL
};
1443 struct ref
*ref
, **dst_tail
= tail_ref(dst
);
1444 struct string_list dst_ref_index
= STRING_LIST_INIT_NODUP
;
1448 refspec
= default_refspec
;
1450 rs
= parse_push_refspec(nr_refspec
, (const char **) refspec
);
1451 errs
= match_explicit_refs(src
, *dst
, &dst_tail
, rs
, nr_refspec
);
1453 /* pick the remainder */
1454 for (ref
= src
; ref
; ref
= ref
->next
) {
1455 struct string_list_item
*dst_item
;
1456 struct ref
*dst_peer
;
1457 const struct refspec
*pat
= NULL
;
1460 dst_name
= get_ref_match(rs
, nr_refspec
, ref
, send_mirror
, FROM_SRC
, &pat
);
1464 if (!dst_ref_index
.nr
)
1465 prepare_ref_index(&dst_ref_index
, *dst
);
1467 dst_item
= string_list_lookup(&dst_ref_index
, dst_name
);
1468 dst_peer
= dst_item
? dst_item
->util
: NULL
;
1470 if (dst_peer
->peer_ref
)
1471 /* We're already sending something to this ref. */
1474 if (pat
->matching
&& !(send_all
|| send_mirror
))
1476 * Remote doesn't have it, and we have no
1477 * explicit pattern, and we don't have
1478 * --all or --mirror.
1482 /* Create a new one and link it */
1483 dst_peer
= make_linked_ref(dst_name
, &dst_tail
);
1484 hashcpy(dst_peer
->new_sha1
, ref
->new_sha1
);
1485 string_list_insert(&dst_ref_index
,
1486 dst_peer
->name
)->util
= dst_peer
;
1488 dst_peer
->peer_ref
= copy_ref(ref
);
1489 dst_peer
->force
= pat
->force
;
1494 string_list_clear(&dst_ref_index
, 0);
1496 if (flags
& MATCH_REFS_FOLLOW_TAGS
)
1497 add_missing_tags(src
, dst
, &dst_tail
);
1500 struct string_list src_ref_index
= STRING_LIST_INIT_NODUP
;
1501 /* check for missing refs on the remote */
1502 for (ref
= *dst
; ref
; ref
= ref
->next
) {
1506 /* We're already sending something to this ref. */
1509 src_name
= get_ref_match(rs
, nr_refspec
, ref
, send_mirror
, FROM_DST
, NULL
);
1511 if (!src_ref_index
.nr
)
1512 prepare_ref_index(&src_ref_index
, src
);
1513 if (!string_list_has_string(&src_ref_index
,
1515 ref
->peer_ref
= alloc_delete_ref();
1519 string_list_clear(&src_ref_index
, 0);
1526 void set_ref_status_for_push(struct ref
*remote_refs
, int send_mirror
,
1531 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
1532 int force_ref_update
= ref
->force
|| force_update
;
1533 int reject_reason
= 0;
1536 hashcpy(ref
->new_sha1
, ref
->peer_ref
->new_sha1
);
1537 else if (!send_mirror
)
1540 ref
->deletion
= is_null_sha1(ref
->new_sha1
);
1541 if (!ref
->deletion
&&
1542 !hashcmp(ref
->old_sha1
, ref
->new_sha1
)) {
1543 ref
->status
= REF_STATUS_UPTODATE
;
1548 * Bypass the usual "must fast-forward" check but
1549 * replace it with a weaker "the old value must be
1550 * this value we observed". If the remote ref has
1551 * moved and is now different from what we expect,
1554 * It also is an error if the user told us to check
1555 * with the remote-tracking branch to find the value
1556 * to expect, but we did not have such a tracking
1559 if (ref
->expect_old_sha1
) {
1560 if (ref
->expect_old_no_trackback
||
1561 hashcmp(ref
->old_sha1
, ref
->old_sha1_expect
))
1562 reject_reason
= REF_STATUS_REJECT_STALE
;
1566 * The usual "must fast-forward" rules.
1568 * Decide whether an individual refspec A:B can be
1569 * pushed. The push will succeed if any of the
1570 * following are true:
1572 * (1) the remote reference B does not exist
1574 * (2) the remote reference B is being removed (i.e.,
1575 * pushing :B where no source is specified)
1577 * (3) the destination is not under refs/tags/, and
1578 * if the old and new value is a commit, the new
1579 * is a descendant of the old.
1581 * (4) it is forced using the +A:B notation, or by
1582 * passing the --force argument
1585 else if (!ref
->deletion
&& !is_null_sha1(ref
->old_sha1
)) {
1586 if (starts_with(ref
->name
, "refs/tags/"))
1587 reject_reason
= REF_STATUS_REJECT_ALREADY_EXISTS
;
1588 else if (!has_sha1_file(ref
->old_sha1
))
1589 reject_reason
= REF_STATUS_REJECT_FETCH_FIRST
;
1590 else if (!lookup_commit_reference_gently(ref
->old_sha1
, 1) ||
1591 !lookup_commit_reference_gently(ref
->new_sha1
, 1))
1592 reject_reason
= REF_STATUS_REJECT_NEEDS_FORCE
;
1593 else if (!ref_newer(ref
->new_sha1
, ref
->old_sha1
))
1594 reject_reason
= REF_STATUS_REJECT_NONFASTFORWARD
;
1598 * "--force" will defeat any rejection implemented
1599 * by the rules above.
1601 if (!force_ref_update
)
1602 ref
->status
= reject_reason
;
1603 else if (reject_reason
)
1604 ref
->forced_update
= 1;
1608 static void set_merge(struct branch
*ret
)
1610 struct remote
*remote
;
1612 unsigned char sha1
[20];
1616 return; /* no branch */
1618 return; /* already run */
1619 if (!ret
->remote_name
|| !ret
->merge_nr
) {
1621 * no merge config; let's make sure we don't confuse callers
1622 * with a non-zero merge_nr but a NULL merge
1628 remote
= remote_get(ret
->remote_name
);
1630 ret
->merge
= xcalloc(ret
->merge_nr
, sizeof(*ret
->merge
));
1631 for (i
= 0; i
< ret
->merge_nr
; i
++) {
1632 ret
->merge
[i
] = xcalloc(1, sizeof(**ret
->merge
));
1633 ret
->merge
[i
]->src
= xstrdup(ret
->merge_name
[i
]);
1634 if (!remote_find_tracking(remote
, ret
->merge
[i
]) ||
1635 strcmp(ret
->remote_name
, "."))
1637 if (dwim_ref(ret
->merge_name
[i
], strlen(ret
->merge_name
[i
]),
1639 ret
->merge
[i
]->dst
= ref
;
1641 ret
->merge
[i
]->dst
= xstrdup(ret
->merge_name
[i
]);
1645 struct branch
*branch_get(const char *name
)
1650 if (!name
|| !*name
|| !strcmp(name
, "HEAD"))
1651 ret
= current_branch
;
1653 ret
= make_branch(name
, 0);
1658 int branch_has_merge_config(struct branch
*branch
)
1660 return branch
&& !!branch
->merge
;
1663 int branch_merge_matches(struct branch
*branch
,
1665 const char *refname
)
1667 if (!branch
|| i
< 0 || i
>= branch
->merge_nr
)
1669 return refname_match(branch
->merge
[i
]->src
, refname
);
1672 __attribute((format (printf
,2,3)))
1673 static const char *error_buf(struct strbuf
*err
, const char *fmt
, ...)
1678 strbuf_vaddf(err
, fmt
, ap
);
1684 const char *branch_get_upstream(struct branch
*branch
, struct strbuf
*err
)
1687 return error_buf(err
, _("HEAD does not point to a branch"));
1689 if (!branch
->merge
|| !branch
->merge
[0]) {
1691 * no merge config; is it because the user didn't define any,
1692 * or because it is not a real branch, and get_branch
1695 if (!ref_exists(branch
->refname
))
1696 return error_buf(err
, _("no such branch: '%s'"),
1698 return error_buf(err
,
1699 _("no upstream configured for branch '%s'"),
1703 if (!branch
->merge
[0]->dst
)
1704 return error_buf(err
,
1705 _("upstream branch '%s' not stored as a remote-tracking branch"),
1706 branch
->merge
[0]->src
);
1708 return branch
->merge
[0]->dst
;
1711 static const char *tracking_for_push_dest(struct remote
*remote
,
1712 const char *refname
,
1717 ret
= apply_refspecs(remote
->fetch
, remote
->fetch_refspec_nr
, refname
);
1719 return error_buf(err
,
1720 _("push destination '%s' on remote '%s' has no local tracking branch"),
1721 refname
, remote
->name
);
1725 static const char *branch_get_push_1(struct branch
*branch
, struct strbuf
*err
)
1727 struct remote
*remote
;
1730 return error_buf(err
, _("HEAD does not point to a branch"));
1732 remote
= remote_get(pushremote_for_branch(branch
, NULL
));
1734 return error_buf(err
,
1735 _("branch '%s' has no remote for pushing"),
1738 if (remote
->push_refspec_nr
) {
1742 dst
= apply_refspecs(remote
->push
, remote
->push_refspec_nr
,
1745 return error_buf(err
,
1746 _("push refspecs for '%s' do not include '%s'"),
1747 remote
->name
, branch
->name
);
1749 ret
= tracking_for_push_dest(remote
, dst
, err
);
1755 return tracking_for_push_dest(remote
, branch
->refname
, err
);
1757 switch (push_default
) {
1758 case PUSH_DEFAULT_NOTHING
:
1759 return error_buf(err
, _("push has no destination (push.default is 'nothing')"));
1761 case PUSH_DEFAULT_MATCHING
:
1762 case PUSH_DEFAULT_CURRENT
:
1763 return tracking_for_push_dest(remote
, branch
->refname
, err
);
1765 case PUSH_DEFAULT_UPSTREAM
:
1766 return branch_get_upstream(branch
, err
);
1768 case PUSH_DEFAULT_UNSPECIFIED
:
1769 case PUSH_DEFAULT_SIMPLE
:
1771 const char *up
, *cur
;
1773 up
= branch_get_upstream(branch
, err
);
1776 cur
= tracking_for_push_dest(remote
, branch
->refname
, err
);
1779 if (strcmp(cur
, up
))
1780 return error_buf(err
,
1781 _("cannot resolve 'simple' push to a single destination"));
1786 die("BUG: unhandled push situation");
1789 const char *branch_get_push(struct branch
*branch
, struct strbuf
*err
)
1791 if (!branch
->push_tracking_ref
)
1792 branch
->push_tracking_ref
= branch_get_push_1(branch
, err
);
1793 return branch
->push_tracking_ref
;
1796 static int ignore_symref_update(const char *refname
)
1798 unsigned char sha1
[20];
1801 if (!resolve_ref_unsafe(refname
, 0, sha1
, &flag
))
1802 return 0; /* non-existing refs are OK */
1803 return (flag
& REF_ISSYMREF
);
1807 * Create and return a list of (struct ref) consisting of copies of
1808 * each remote_ref that matches refspec. refspec must be a pattern.
1809 * Fill in the copies' peer_ref to describe the local tracking refs to
1810 * which they map. Omit any references that would map to an existing
1811 * local symbolic ref.
1813 static struct ref
*get_expanded_map(const struct ref
*remote_refs
,
1814 const struct refspec
*refspec
)
1816 const struct ref
*ref
;
1817 struct ref
*ret
= NULL
;
1818 struct ref
**tail
= &ret
;
1820 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
1821 char *expn_name
= NULL
;
1823 if (strchr(ref
->name
, '^'))
1824 continue; /* a dereference item */
1825 if (match_name_with_pattern(refspec
->src
, ref
->name
,
1826 refspec
->dst
, &expn_name
) &&
1827 !ignore_symref_update(expn_name
)) {
1828 struct ref
*cpy
= copy_ref(ref
);
1830 cpy
->peer_ref
= alloc_ref(expn_name
);
1832 cpy
->peer_ref
->force
= 1;
1842 static const struct ref
*find_ref_by_name_abbrev(const struct ref
*refs
, const char *name
)
1844 const struct ref
*ref
;
1845 for (ref
= refs
; ref
; ref
= ref
->next
) {
1846 if (refname_match(name
, ref
->name
))
1852 struct ref
*get_remote_ref(const struct ref
*remote_refs
, const char *name
)
1854 const struct ref
*ref
= find_ref_by_name_abbrev(remote_refs
, name
);
1859 return copy_ref(ref
);
1862 static struct ref
*get_local_ref(const char *name
)
1864 if (!name
|| name
[0] == '\0')
1867 if (starts_with(name
, "refs/"))
1868 return alloc_ref(name
);
1870 if (starts_with(name
, "heads/") ||
1871 starts_with(name
, "tags/") ||
1872 starts_with(name
, "remotes/"))
1873 return alloc_ref_with_prefix("refs/", 5, name
);
1875 return alloc_ref_with_prefix("refs/heads/", 11, name
);
1878 int get_fetch_map(const struct ref
*remote_refs
,
1879 const struct refspec
*refspec
,
1883 struct ref
*ref_map
, **rmp
;
1885 if (refspec
->pattern
) {
1886 ref_map
= get_expanded_map(remote_refs
, refspec
);
1888 const char *name
= refspec
->src
[0] ? refspec
->src
: "HEAD";
1890 if (refspec
->exact_sha1
) {
1891 ref_map
= alloc_ref(name
);
1892 get_sha1_hex(name
, ref_map
->old_sha1
);
1894 ref_map
= get_remote_ref(remote_refs
, name
);
1896 if (!missing_ok
&& !ref_map
)
1897 die("Couldn't find remote ref %s", name
);
1899 ref_map
->peer_ref
= get_local_ref(refspec
->dst
);
1900 if (ref_map
->peer_ref
&& refspec
->force
)
1901 ref_map
->peer_ref
->force
= 1;
1905 for (rmp
= &ref_map
; *rmp
; ) {
1906 if ((*rmp
)->peer_ref
) {
1907 if (!starts_with((*rmp
)->peer_ref
->name
, "refs/") ||
1908 check_refname_format((*rmp
)->peer_ref
->name
, 0)) {
1909 struct ref
*ignore
= *rmp
;
1910 error("* Ignoring funny ref '%s' locally",
1911 (*rmp
)->peer_ref
->name
);
1912 *rmp
= (*rmp
)->next
;
1913 free(ignore
->peer_ref
);
1918 rmp
= &((*rmp
)->next
);
1922 tail_link_ref(ref_map
, tail
);
1927 int resolve_remote_symref(struct ref
*ref
, struct ref
*list
)
1931 for (; list
; list
= list
->next
)
1932 if (!strcmp(ref
->symref
, list
->name
)) {
1933 hashcpy(ref
->old_sha1
, list
->old_sha1
);
1939 static void unmark_and_free(struct commit_list
*list
, unsigned int mark
)
1942 struct commit_list
*temp
= list
;
1943 temp
->item
->object
.flags
&= ~mark
;
1949 int ref_newer(const unsigned char *new_sha1
, const unsigned char *old_sha1
)
1952 struct commit
*old
, *new;
1953 struct commit_list
*list
, *used
;
1957 * Both new and old must be commit-ish and new is descendant of
1958 * old. Otherwise we require --force.
1960 o
= deref_tag(parse_object(old_sha1
), NULL
, 0);
1961 if (!o
|| o
->type
!= OBJ_COMMIT
)
1963 old
= (struct commit
*) o
;
1965 o
= deref_tag(parse_object(new_sha1
), NULL
, 0);
1966 if (!o
|| o
->type
!= OBJ_COMMIT
)
1968 new = (struct commit
*) o
;
1970 if (parse_commit(new) < 0)
1974 commit_list_insert(new, &list
);
1976 new = pop_most_recent_commit(&list
, TMP_MARK
);
1977 commit_list_insert(new, &used
);
1983 unmark_and_free(list
, TMP_MARK
);
1984 unmark_and_free(used
, TMP_MARK
);
1989 * Compare a branch with its upstream, and save their differences (number
1990 * of commits) in *num_ours and *num_theirs. The name of the upstream branch
1991 * (or NULL if no upstream is defined) is returned via *upstream_name, if it
1992 * is not itself NULL.
1994 * Returns -1 if num_ours and num_theirs could not be filled in (e.g., no
1995 * upstream defined, or ref does not exist), 0 otherwise.
1997 int stat_tracking_info(struct branch
*branch
, int *num_ours
, int *num_theirs
,
1998 const char **upstream_name
)
2000 unsigned char sha1
[20];
2001 struct commit
*ours
, *theirs
;
2002 struct rev_info revs
;
2004 struct argv_array argv
= ARGV_ARRAY_INIT
;
2006 /* Cannot stat unless we are marked to build on top of somebody else. */
2007 base
= branch_get_upstream(branch
, NULL
);
2009 *upstream_name
= base
;
2013 /* Cannot stat if what we used to build on no longer exists */
2014 if (read_ref(base
, sha1
))
2016 theirs
= lookup_commit_reference(sha1
);
2020 if (read_ref(branch
->refname
, sha1
))
2022 ours
= lookup_commit_reference(sha1
);
2026 /* are we the same? */
2027 if (theirs
== ours
) {
2028 *num_theirs
= *num_ours
= 0;
2032 /* Run "rev-list --left-right ours...theirs" internally... */
2033 argv_array_push(&argv
, ""); /* ignored */
2034 argv_array_push(&argv
, "--left-right");
2035 argv_array_pushf(&argv
, "%s...%s",
2036 sha1_to_hex(ours
->object
.sha1
),
2037 sha1_to_hex(theirs
->object
.sha1
));
2038 argv_array_push(&argv
, "--");
2040 init_revisions(&revs
, NULL
);
2041 setup_revisions(argv
.argc
, argv
.argv
, &revs
, NULL
);
2042 if (prepare_revision_walk(&revs
))
2043 die("revision walk setup failed");
2045 /* ... and count the commits on each side. */
2049 struct commit
*c
= get_revision(&revs
);
2052 if (c
->object
.flags
& SYMMETRIC_LEFT
)
2058 /* clear object flags smudged by the above traversal */
2059 clear_commit_marks(ours
, ALL_REV_FLAGS
);
2060 clear_commit_marks(theirs
, ALL_REV_FLAGS
);
2062 argv_array_clear(&argv
);
2067 * Return true when there is anything to report, otherwise false.
2069 int format_tracking_info(struct branch
*branch
, struct strbuf
*sb
)
2072 const char *full_base
;
2074 int upstream_is_gone
= 0;
2076 if (stat_tracking_info(branch
, &ours
, &theirs
, &full_base
) < 0) {
2079 upstream_is_gone
= 1;
2082 base
= shorten_unambiguous_ref(full_base
, 0);
2083 if (upstream_is_gone
) {
2085 _("Your branch is based on '%s', but the upstream is gone.\n"),
2087 if (advice_status_hints
)
2089 _(" (use \"git branch --unset-upstream\" to fixup)\n"));
2090 } else if (!ours
&& !theirs
) {
2092 _("Your branch is up-to-date with '%s'.\n"),
2094 } else if (!theirs
) {
2096 Q_("Your branch is ahead of '%s' by %d commit.\n",
2097 "Your branch is ahead of '%s' by %d commits.\n",
2100 if (advice_status_hints
)
2102 _(" (use \"git push\" to publish your local commits)\n"));
2105 Q_("Your branch is behind '%s' by %d commit, "
2106 "and can be fast-forwarded.\n",
2107 "Your branch is behind '%s' by %d commits, "
2108 "and can be fast-forwarded.\n",
2111 if (advice_status_hints
)
2113 _(" (use \"git pull\" to update your local branch)\n"));
2116 Q_("Your branch and '%s' have diverged,\n"
2117 "and have %d and %d different commit each, "
2119 "Your branch and '%s' have diverged,\n"
2120 "and have %d and %d different commits each, "
2123 base
, ours
, theirs
);
2124 if (advice_status_hints
)
2126 _(" (use \"git pull\" to merge the remote branch into yours)\n"));
2132 static int one_local_ref(const char *refname
, const struct object_id
*oid
,
2133 int flag
, void *cb_data
)
2135 struct ref
***local_tail
= cb_data
;
2139 /* we already know it starts with refs/ to get here */
2140 if (check_refname_format(refname
+ 5, 0))
2143 len
= strlen(refname
) + 1;
2144 ref
= xcalloc(1, sizeof(*ref
) + len
);
2145 hashcpy(ref
->new_sha1
, oid
->hash
);
2146 memcpy(ref
->name
, refname
, len
);
2148 *local_tail
= &ref
->next
;
2152 struct ref
*get_local_heads(void)
2154 struct ref
*local_refs
= NULL
, **local_tail
= &local_refs
;
2156 for_each_ref(one_local_ref
, &local_tail
);
2160 struct ref
*guess_remote_head(const struct ref
*head
,
2161 const struct ref
*refs
,
2164 const struct ref
*r
;
2165 struct ref
*list
= NULL
;
2166 struct ref
**tail
= &list
;
2172 * Some transports support directly peeking at
2173 * where HEAD points; if that is the case, then
2174 * we don't have to guess.
2177 return copy_ref(find_ref_by_name(refs
, head
->symref
));
2179 /* If refs/heads/master could be right, it is. */
2181 r
= find_ref_by_name(refs
, "refs/heads/master");
2182 if (r
&& !hashcmp(r
->old_sha1
, head
->old_sha1
))
2186 /* Look for another ref that points there */
2187 for (r
= refs
; r
; r
= r
->next
) {
2189 starts_with(r
->name
, "refs/heads/") &&
2190 !hashcmp(r
->old_sha1
, head
->old_sha1
)) {
2191 *tail
= copy_ref(r
);
2192 tail
= &((*tail
)->next
);
2201 struct stale_heads_info
{
2202 struct string_list
*ref_names
;
2203 struct ref
**stale_refs_tail
;
2204 struct refspec
*refs
;
2208 static int get_stale_heads_cb(const char *refname
, const struct object_id
*oid
,
2209 int flags
, void *cb_data
)
2211 struct stale_heads_info
*info
= cb_data
;
2212 struct string_list matches
= STRING_LIST_INIT_DUP
;
2213 struct refspec query
;
2215 memset(&query
, 0, sizeof(struct refspec
));
2216 query
.dst
= (char *)refname
;
2218 query_refspecs_multiple(info
->refs
, info
->ref_count
, &query
, &matches
);
2219 if (matches
.nr
== 0)
2220 goto clean_exit
; /* No matches */
2223 * If we did find a suitable refspec and it's not a symref and
2224 * it's not in the list of refs that currently exist in that
2225 * remote, we consider it to be stale. In order to deal with
2226 * overlapping refspecs, we need to go over all of the
2229 if (flags
& REF_ISSYMREF
)
2232 for (i
= 0; stale
&& i
< matches
.nr
; i
++)
2233 if (string_list_has_string(info
->ref_names
, matches
.items
[i
].string
))
2237 struct ref
*ref
= make_linked_ref(refname
, &info
->stale_refs_tail
);
2238 hashcpy(ref
->new_sha1
, oid
->hash
);
2242 string_list_clear(&matches
, 0);
2246 struct ref
*get_stale_heads(struct refspec
*refs
, int ref_count
, struct ref
*fetch_map
)
2248 struct ref
*ref
, *stale_refs
= NULL
;
2249 struct string_list ref_names
= STRING_LIST_INIT_NODUP
;
2250 struct stale_heads_info info
;
2252 info
.ref_names
= &ref_names
;
2253 info
.stale_refs_tail
= &stale_refs
;
2255 info
.ref_count
= ref_count
;
2256 for (ref
= fetch_map
; ref
; ref
= ref
->next
)
2257 string_list_append(&ref_names
, ref
->name
);
2258 string_list_sort(&ref_names
);
2259 for_each_ref(get_stale_heads_cb
, &info
);
2260 string_list_clear(&ref_names
, 0);
2267 static void clear_cas_option(struct push_cas_option
*cas
)
2271 for (i
= 0; i
< cas
->nr
; i
++)
2272 free(cas
->entry
[i
].refname
);
2274 memset(cas
, 0, sizeof(*cas
));
2277 static struct push_cas
*add_cas_entry(struct push_cas_option
*cas
,
2278 const char *refname
,
2281 struct push_cas
*entry
;
2282 ALLOC_GROW(cas
->entry
, cas
->nr
+ 1, cas
->alloc
);
2283 entry
= &cas
->entry
[cas
->nr
++];
2284 memset(entry
, 0, sizeof(*entry
));
2285 entry
->refname
= xmemdupz(refname
, refnamelen
);
2289 int parse_push_cas_option(struct push_cas_option
*cas
, const char *arg
, int unset
)
2292 struct push_cas
*entry
;
2295 /* "--no-<option>" */
2296 clear_cas_option(cas
);
2301 /* just "--<option>" */
2302 cas
->use_tracking_for_rest
= 1;
2306 /* "--<option>=refname" or "--<option>=refname:value" */
2307 colon
= strchrnul(arg
, ':');
2308 entry
= add_cas_entry(cas
, arg
, colon
- arg
);
2310 entry
->use_tracking
= 1;
2311 else if (get_sha1(colon
+ 1, entry
->expect
))
2312 return error("cannot parse expected object name '%s'", colon
+ 1);
2316 int parseopt_push_cas_option(const struct option
*opt
, const char *arg
, int unset
)
2318 return parse_push_cas_option(opt
->value
, arg
, unset
);
2321 int is_empty_cas(const struct push_cas_option
*cas
)
2323 return !cas
->use_tracking_for_rest
&& !cas
->nr
;
2327 * Look at remote.fetch refspec and see if we have a remote
2328 * tracking branch for the refname there. Fill its current
2330 * If we cannot do so, return negative to signal an error.
2332 static int remote_tracking(struct remote
*remote
, const char *refname
,
2333 unsigned char sha1
[20])
2337 dst
= apply_refspecs(remote
->fetch
, remote
->fetch_refspec_nr
, refname
);
2339 return -1; /* no tracking ref for refname at remote */
2340 if (read_ref(dst
, sha1
))
2341 return -1; /* we know what the tracking ref is but we cannot read it */
2345 static void apply_cas(struct push_cas_option
*cas
,
2346 struct remote
*remote
,
2351 /* Find an explicit --<option>=<name>[:<value>] entry */
2352 for (i
= 0; i
< cas
->nr
; i
++) {
2353 struct push_cas
*entry
= &cas
->entry
[i
];
2354 if (!refname_match(entry
->refname
, ref
->name
))
2356 ref
->expect_old_sha1
= 1;
2357 if (!entry
->use_tracking
)
2358 hashcpy(ref
->old_sha1_expect
, cas
->entry
[i
].expect
);
2359 else if (remote_tracking(remote
, ref
->name
, ref
->old_sha1_expect
))
2360 ref
->expect_old_no_trackback
= 1;
2364 /* Are we using "--<option>" to cover all? */
2365 if (!cas
->use_tracking_for_rest
)
2368 ref
->expect_old_sha1
= 1;
2369 if (remote_tracking(remote
, ref
->name
, ref
->old_sha1_expect
))
2370 ref
->expect_old_no_trackback
= 1;
2373 void apply_push_cas(struct push_cas_option
*cas
,
2374 struct remote
*remote
,
2375 struct ref
*remote_refs
)
2378 for (ref
= remote_refs
; ref
; ref
= ref
->next
)
2379 apply_cas(cas
, remote
, ref
);