9 #include "string-list.h"
10 #include "mergesort.h"
12 enum map_direction
{ FROM_SRC
, FROM_DST
};
14 static struct refspec s_tag_refspec
= {
23 const struct refspec
*tag_refspec
= &s_tag_refspec
;
25 struct counted_string
{
32 struct counted_string
*instead_of
;
37 struct rewrite
**rewrite
;
42 static struct remote
**remotes
;
43 static int remotes_alloc
;
44 static int remotes_nr
;
45 static struct hashmap remotes_hash
;
47 static struct branch
**branches
;
48 static int branches_alloc
;
49 static int branches_nr
;
51 static struct branch
*current_branch
;
52 static const char *pushremote_name
;
54 static struct rewrites rewrites
;
55 static struct rewrites rewrites_push
;
57 #define BUF_SIZE (2048)
58 static char buffer
[BUF_SIZE
];
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
)
69 struct counted_string
*longest
;
74 for (i
= 0; i
< r
->rewrite_nr
; i
++) {
77 for (j
= 0; j
< r
->rewrite
[i
]->instead_of_nr
; j
++) {
78 if (starts_with(url
, r
->rewrite
[i
]->instead_of
[j
].s
) &&
80 longest
->len
< r
->rewrite
[i
]->instead_of
[j
].len
)) {
81 longest
= &(r
->rewrite
[i
]->instead_of
[j
]);
89 ret
= xmalloc(r
->rewrite
[longest_i
]->baselen
+
90 (strlen(url
) - longest
->len
) + 1);
91 strcpy(ret
, r
->rewrite
[longest_i
]->base
);
92 strcpy(ret
+ r
->rewrite
[longest_i
]->baselen
, url
+ longest
->len
);
96 static void add_push_refspec(struct remote
*remote
, const char *ref
)
98 ALLOC_GROW(remote
->push_refspec
,
99 remote
->push_refspec_nr
+ 1,
100 remote
->push_refspec_alloc
);
101 remote
->push_refspec
[remote
->push_refspec_nr
++] = ref
;
104 static void add_fetch_refspec(struct remote
*remote
, const char *ref
)
106 ALLOC_GROW(remote
->fetch_refspec
,
107 remote
->fetch_refspec_nr
+ 1,
108 remote
->fetch_refspec_alloc
);
109 remote
->fetch_refspec
[remote
->fetch_refspec_nr
++] = ref
;
112 static void add_url(struct remote
*remote
, const char *url
)
114 ALLOC_GROW(remote
->url
, remote
->url_nr
+ 1, remote
->url_alloc
);
115 remote
->url
[remote
->url_nr
++] = url
;
118 static void add_pushurl(struct remote
*remote
, const char *pushurl
)
120 ALLOC_GROW(remote
->pushurl
, remote
->pushurl_nr
+ 1, remote
->pushurl_alloc
);
121 remote
->pushurl
[remote
->pushurl_nr
++] = pushurl
;
124 static void add_pushurl_alias(struct remote
*remote
, const char *url
)
126 const char *pushurl
= alias_url(url
, &rewrites_push
);
128 add_pushurl(remote
, pushurl
);
131 static void add_url_alias(struct remote
*remote
, const char *url
)
133 add_url(remote
, alias_url(url
, &rewrites
));
134 add_pushurl_alias(remote
, url
);
137 struct remotes_hash_key
{
142 static int remotes_hash_cmp(const struct remote
*a
, const struct remote
*b
, const struct remotes_hash_key
*key
)
145 return strncmp(a
->name
, key
->str
, key
->len
) || a
->name
[key
->len
];
147 return strcmp(a
->name
, b
->name
);
150 static inline void init_remotes_hash(void)
152 if (!remotes_hash
.cmpfn
)
153 hashmap_init(&remotes_hash
, (hashmap_cmp_fn
)remotes_hash_cmp
, 0);
156 static struct remote
*make_remote(const char *name
, int len
)
158 struct remote
*ret
, *replaced
;
159 struct remotes_hash_key lookup
;
160 struct hashmap_entry lookup_entry
;
168 hashmap_entry_init(&lookup_entry
, memhash(name
, len
));
170 if ((ret
= hashmap_get(&remotes_hash
, &lookup_entry
, &lookup
)) != NULL
)
173 ret
= xcalloc(1, sizeof(struct remote
));
174 ret
->prune
= -1; /* unspecified */
175 ALLOC_GROW(remotes
, remotes_nr
+ 1, remotes_alloc
);
176 remotes
[remotes_nr
++] = ret
;
177 ret
->name
= xstrndup(name
, len
);
179 hashmap_entry_init(ret
, lookup_entry
.hash
);
180 replaced
= hashmap_put(&remotes_hash
, ret
);
181 assert(replaced
== NULL
); /* no previous entry overwritten */
185 static void add_merge(struct branch
*branch
, const char *name
)
187 ALLOC_GROW(branch
->merge_name
, branch
->merge_nr
+ 1,
188 branch
->merge_alloc
);
189 branch
->merge_name
[branch
->merge_nr
++] = name
;
192 static struct branch
*make_branch(const char *name
, int len
)
197 for (i
= 0; i
< branches_nr
; i
++) {
198 if (len
? (!strncmp(name
, branches
[i
]->name
, len
) &&
199 !branches
[i
]->name
[len
]) :
200 !strcmp(name
, branches
[i
]->name
))
204 ALLOC_GROW(branches
, branches_nr
+ 1, branches_alloc
);
205 ret
= xcalloc(1, sizeof(struct branch
));
206 branches
[branches_nr
++] = ret
;
208 ret
->name
= xstrndup(name
, len
);
210 ret
->name
= xstrdup(name
);
211 ret
->refname
= xstrfmt("refs/heads/%s", ret
->name
);
216 static struct rewrite
*make_rewrite(struct rewrites
*r
, const char *base
, int len
)
221 for (i
= 0; i
< r
->rewrite_nr
; i
++) {
223 ? (len
== r
->rewrite
[i
]->baselen
&&
224 !strncmp(base
, r
->rewrite
[i
]->base
, len
))
225 : !strcmp(base
, r
->rewrite
[i
]->base
))
226 return r
->rewrite
[i
];
229 ALLOC_GROW(r
->rewrite
, r
->rewrite_nr
+ 1, r
->rewrite_alloc
);
230 ret
= xcalloc(1, sizeof(struct rewrite
));
231 r
->rewrite
[r
->rewrite_nr
++] = ret
;
233 ret
->base
= xstrndup(base
, len
);
237 ret
->base
= xstrdup(base
);
238 ret
->baselen
= strlen(base
);
243 static void add_instead_of(struct rewrite
*rewrite
, const char *instead_of
)
245 ALLOC_GROW(rewrite
->instead_of
, rewrite
->instead_of_nr
+ 1, rewrite
->instead_of_alloc
);
246 rewrite
->instead_of
[rewrite
->instead_of_nr
].s
= instead_of
;
247 rewrite
->instead_of
[rewrite
->instead_of_nr
].len
= strlen(instead_of
);
248 rewrite
->instead_of_nr
++;
251 static void read_remotes_file(struct remote
*remote
)
253 FILE *f
= fopen(git_path("remotes/%s", remote
->name
), "r");
257 remote
->origin
= REMOTE_REMOTES
;
258 while (fgets(buffer
, BUF_SIZE
, f
)) {
262 if (starts_with(buffer
, "URL:")) {
265 } else if (starts_with(buffer
, "Push:")) {
268 } else if (starts_with(buffer
, "Pull:")) {
280 while (isspace(p
[-1]))
283 switch (value_list
) {
285 add_url_alias(remote
, xstrdup(s
));
288 add_push_refspec(remote
, xstrdup(s
));
291 add_fetch_refspec(remote
, xstrdup(s
));
298 static void read_branches_file(struct remote
*remote
)
301 struct strbuf branch
= STRBUF_INIT
;
303 FILE *f
= fopen(git_path("branches/%.*s", n
, remote
->name
), "r");
309 s
= fgets(buffer
, BUF_SIZE
, f
);
317 remote
->origin
= REMOTE_BRANCHES
;
319 while (isspace(p
[-1]))
322 p
= xmalloc(len
+ 1);
326 * The branches file would have URL and optionally
327 * #branch specified. The "master" (or specified) branch is
328 * fetched and stored in the local branch of the same name.
330 frag
= strchr(p
, '#');
333 strbuf_addf(&branch
, "refs/heads/%s", frag
);
335 strbuf_addstr(&branch
, "refs/heads/master");
337 strbuf_addf(&branch
, ":refs/heads/%s", remote
->name
);
338 add_url_alias(remote
, p
);
339 add_fetch_refspec(remote
, strbuf_detach(&branch
, NULL
));
341 * Cogito compatible push: push current HEAD to remote #branch
342 * (master if missing)
344 strbuf_init(&branch
, 0);
345 strbuf_addstr(&branch
, "HEAD");
347 strbuf_addf(&branch
, ":refs/heads/%s", frag
);
349 strbuf_addstr(&branch
, ":refs/heads/master");
350 add_push_refspec(remote
, strbuf_detach(&branch
, NULL
));
351 remote
->fetch_tags
= 1; /* always auto-follow */
354 static int handle_config(const char *key
, const char *value
, void *cb
)
358 struct remote
*remote
;
359 struct branch
*branch
;
360 if (starts_with(key
, "branch.")) {
362 subkey
= strrchr(name
, '.');
365 branch
= make_branch(name
, subkey
- name
);
366 if (!strcmp(subkey
, ".remote")) {
367 return git_config_string(&branch
->remote_name
, key
, value
);
368 } else if (!strcmp(subkey
, ".pushremote")) {
369 return git_config_string(&branch
->pushremote_name
, key
, value
);
370 } else if (!strcmp(subkey
, ".merge")) {
372 return config_error_nonbool(key
);
373 add_merge(branch
, xstrdup(value
));
377 if (starts_with(key
, "url.")) {
378 struct rewrite
*rewrite
;
380 subkey
= strrchr(name
, '.');
383 if (!strcmp(subkey
, ".insteadof")) {
384 rewrite
= make_rewrite(&rewrites
, name
, subkey
- name
);
386 return config_error_nonbool(key
);
387 add_instead_of(rewrite
, xstrdup(value
));
388 } else if (!strcmp(subkey
, ".pushinsteadof")) {
389 rewrite
= make_rewrite(&rewrites_push
, name
, subkey
- name
);
391 return config_error_nonbool(key
);
392 add_instead_of(rewrite
, xstrdup(value
));
396 if (!starts_with(key
, "remote."))
400 /* Handle remote.* variables */
401 if (!strcmp(name
, "pushdefault"))
402 return git_config_string(&pushremote_name
, key
, value
);
404 /* Handle remote.<name>.* variables */
406 warning("Config remote shorthand cannot begin with '/': %s",
410 subkey
= strrchr(name
, '.');
413 remote
= make_remote(name
, subkey
- name
);
414 remote
->origin
= REMOTE_CONFIG
;
415 if (!strcmp(subkey
, ".mirror"))
416 remote
->mirror
= git_config_bool(key
, value
);
417 else if (!strcmp(subkey
, ".skipdefaultupdate"))
418 remote
->skip_default_update
= git_config_bool(key
, value
);
419 else if (!strcmp(subkey
, ".skipfetchall"))
420 remote
->skip_default_update
= git_config_bool(key
, value
);
421 else if (!strcmp(subkey
, ".prune"))
422 remote
->prune
= git_config_bool(key
, value
);
423 else if (!strcmp(subkey
, ".url")) {
425 if (git_config_string(&v
, key
, value
))
428 } else if (!strcmp(subkey
, ".pushurl")) {
430 if (git_config_string(&v
, key
, value
))
432 add_pushurl(remote
, v
);
433 } else if (!strcmp(subkey
, ".push")) {
435 if (git_config_string(&v
, key
, value
))
437 add_push_refspec(remote
, v
);
438 } else if (!strcmp(subkey
, ".fetch")) {
440 if (git_config_string(&v
, key
, value
))
442 add_fetch_refspec(remote
, v
);
443 } else if (!strcmp(subkey
, ".receivepack")) {
445 if (git_config_string(&v
, key
, value
))
447 if (!remote
->receivepack
)
448 remote
->receivepack
= v
;
450 error("more than one receivepack given, using the first");
451 } else if (!strcmp(subkey
, ".uploadpack")) {
453 if (git_config_string(&v
, key
, value
))
455 if (!remote
->uploadpack
)
456 remote
->uploadpack
= v
;
458 error("more than one uploadpack given, using the first");
459 } else if (!strcmp(subkey
, ".tagopt")) {
460 if (!strcmp(value
, "--no-tags"))
461 remote
->fetch_tags
= -1;
462 else if (!strcmp(value
, "--tags"))
463 remote
->fetch_tags
= 2;
464 } else if (!strcmp(subkey
, ".proxy")) {
465 return git_config_string((const char **)&remote
->http_proxy
,
467 } else if (!strcmp(subkey
, ".vcs")) {
468 return git_config_string(&remote
->foreign_vcs
, key
, value
);
473 static void alias_all_urls(void)
476 for (i
= 0; i
< remotes_nr
; i
++) {
477 int add_pushurl_aliases
;
480 for (j
= 0; j
< remotes
[i
]->pushurl_nr
; j
++) {
481 remotes
[i
]->pushurl
[j
] = alias_url(remotes
[i
]->pushurl
[j
], &rewrites
);
483 add_pushurl_aliases
= remotes
[i
]->pushurl_nr
== 0;
484 for (j
= 0; j
< remotes
[i
]->url_nr
; j
++) {
485 if (add_pushurl_aliases
)
486 add_pushurl_alias(remotes
[i
], remotes
[i
]->url
[j
]);
487 remotes
[i
]->url
[j
] = alias_url(remotes
[i
]->url
[j
], &rewrites
);
492 static void read_config(void)
495 unsigned char sha1
[20];
496 const char *head_ref
;
503 current_branch
= NULL
;
504 head_ref
= resolve_ref_unsafe("HEAD", 0, sha1
, &flag
);
505 if (head_ref
&& (flag
& REF_ISSYMREF
) &&
506 skip_prefix(head_ref
, "refs/heads/", &head_ref
)) {
507 current_branch
= make_branch(head_ref
, 0);
509 git_config(handle_config
, NULL
);
514 * This function frees a refspec array.
515 * Warning: code paths should be checked to ensure that the src
516 * and dst pointers are always freeable pointers as well
517 * as the refspec pointer itself.
519 static void free_refspecs(struct refspec
*refspec
, int nr_refspec
)
526 for (i
= 0; i
< nr_refspec
; i
++) {
527 free(refspec
[i
].src
);
528 free(refspec
[i
].dst
);
533 static struct refspec
*parse_refspec_internal(int nr_refspec
, const char **refspec
, int fetch
, int verify
)
536 struct refspec
*rs
= xcalloc(nr_refspec
, sizeof(*rs
));
538 for (i
= 0; i
< nr_refspec
; i
++) {
541 const char *lhs
, *rhs
;
552 rhs
= strrchr(lhs
, ':');
555 * Before going on, special case ":" (or "+:") as a refspec
556 * for pushing matching refs.
558 if (!fetch
&& rhs
== lhs
&& rhs
[1] == '\0') {
564 size_t rlen
= strlen(++rhs
);
565 is_glob
= (1 <= rlen
&& strchr(rhs
, '*'));
566 rs
[i
].dst
= xstrndup(rhs
, rlen
);
569 llen
= (rhs
? (rhs
- lhs
- 1) : strlen(lhs
));
570 if (1 <= llen
&& memchr(lhs
, '*', llen
)) {
571 if ((rhs
&& !is_glob
) || (!rhs
&& fetch
))
574 } else if (rhs
&& is_glob
) {
578 rs
[i
].pattern
= is_glob
;
579 rs
[i
].src
= xstrndup(lhs
, llen
);
580 flags
= REFNAME_ALLOW_ONELEVEL
| (is_glob
? REFNAME_REFSPEC_PATTERN
: 0);
583 unsigned char unused
[40];
587 ; /* empty is ok; it means "HEAD" */
588 else if (llen
== 40 && !get_sha1_hex(rs
[i
].src
, unused
))
589 rs
[i
].exact_sha1
= 1; /* ok */
590 else if (!check_refname_format(rs
[i
].src
, flags
))
591 ; /* valid looking ref is ok */
596 ; /* missing is ok; it is the same as empty */
597 else if (!*rs
[i
].dst
)
598 ; /* empty is ok; it means "do not store" */
599 else if (!check_refname_format(rs
[i
].dst
, flags
))
600 ; /* valid looking ref is ok */
606 * - empty is allowed; it means delete.
607 * - when wildcarded, it must be a valid looking ref.
608 * - otherwise, it must be an extended SHA-1, but
609 * there is no existing way to validate this.
614 if (check_refname_format(rs
[i
].src
, flags
))
618 ; /* anything goes, for now */
621 * - missing is allowed, but LHS then must be a
623 * - empty is not allowed.
624 * - otherwise it must be a valid looking ref.
627 if (check_refname_format(rs
[i
].src
, flags
))
629 } else if (!*rs
[i
].dst
) {
632 if (check_refname_format(rs
[i
].dst
, flags
))
642 * nr_refspec must be greater than zero and i must be valid
643 * since it is only possible to reach this point from within
644 * the for loop above.
646 free_refspecs(rs
, i
+1);
649 die("Invalid refspec '%s'", refspec
[i
]);
652 int valid_fetch_refspec(const char *fetch_refspec_str
)
654 struct refspec
*refspec
;
656 refspec
= parse_refspec_internal(1, &fetch_refspec_str
, 1, 1);
657 free_refspecs(refspec
, 1);
661 struct refspec
*parse_fetch_refspec(int nr_refspec
, const char **refspec
)
663 return parse_refspec_internal(nr_refspec
, refspec
, 1, 0);
666 static struct refspec
*parse_push_refspec(int nr_refspec
, const char **refspec
)
668 return parse_refspec_internal(nr_refspec
, refspec
, 0, 0);
671 void free_refspec(int nr_refspec
, struct refspec
*refspec
)
674 for (i
= 0; i
< nr_refspec
; i
++) {
675 free(refspec
[i
].src
);
676 free(refspec
[i
].dst
);
681 static int valid_remote_nick(const char *name
)
683 if (!name
[0] || is_dot_or_dotdot(name
))
685 return !strchr(name
, '/'); /* no slash */
688 const char *remote_for_branch(struct branch
*branch
, int *explicit)
690 if (branch
&& branch
->remote_name
) {
693 return branch
->remote_name
;
700 const char *pushremote_for_branch(struct branch
*branch
, int *explicit)
702 if (branch
&& branch
->pushremote_name
) {
705 return branch
->pushremote_name
;
707 if (pushremote_name
) {
710 return pushremote_name
;
712 return remote_for_branch(branch
, explicit);
715 static struct remote
*remote_get_1(const char *name
,
716 const char *(*get_default
)(struct branch
*, int *))
726 name
= get_default(current_branch
, &name_given
);
728 ret
= make_remote(name
, 0);
729 if (valid_remote_nick(name
)) {
730 if (!valid_remote(ret
))
731 read_remotes_file(ret
);
732 if (!valid_remote(ret
))
733 read_branches_file(ret
);
735 if (name_given
&& !valid_remote(ret
))
736 add_url_alias(ret
, name
);
737 if (!valid_remote(ret
))
739 ret
->fetch
= parse_fetch_refspec(ret
->fetch_refspec_nr
, ret
->fetch_refspec
);
740 ret
->push
= parse_push_refspec(ret
->push_refspec_nr
, ret
->push_refspec
);
744 struct remote
*remote_get(const char *name
)
746 return remote_get_1(name
, remote_for_branch
);
749 struct remote
*pushremote_get(const char *name
)
751 return remote_get_1(name
, pushremote_for_branch
);
754 int remote_is_configured(const char *name
)
756 struct remotes_hash_key lookup
;
757 struct hashmap_entry lookup_entry
;
762 lookup
.len
= strlen(name
);
763 hashmap_entry_init(&lookup_entry
, memhash(name
, lookup
.len
));
765 return hashmap_get(&remotes_hash
, &lookup_entry
, &lookup
) != NULL
;
768 int for_each_remote(each_remote_fn fn
, void *priv
)
772 for (i
= 0; i
< remotes_nr
&& !result
; i
++) {
773 struct remote
*r
= remotes
[i
];
777 r
->fetch
= parse_fetch_refspec(r
->fetch_refspec_nr
,
780 r
->push
= parse_push_refspec(r
->push_refspec_nr
,
782 result
= fn(r
, priv
);
787 static void handle_duplicate(struct ref
*ref1
, struct ref
*ref2
)
789 if (strcmp(ref1
->name
, ref2
->name
)) {
790 if (ref1
->fetch_head_status
!= FETCH_HEAD_IGNORE
&&
791 ref2
->fetch_head_status
!= FETCH_HEAD_IGNORE
) {
792 die(_("Cannot fetch both %s and %s to %s"),
793 ref1
->name
, ref2
->name
, ref2
->peer_ref
->name
);
794 } else if (ref1
->fetch_head_status
!= FETCH_HEAD_IGNORE
&&
795 ref2
->fetch_head_status
== FETCH_HEAD_IGNORE
) {
796 warning(_("%s usually tracks %s, not %s"),
797 ref2
->peer_ref
->name
, ref2
->name
, ref1
->name
);
798 } else if (ref1
->fetch_head_status
== FETCH_HEAD_IGNORE
&&
799 ref2
->fetch_head_status
== FETCH_HEAD_IGNORE
) {
800 die(_("%s tracks both %s and %s"),
801 ref2
->peer_ref
->name
, ref1
->name
, ref2
->name
);
804 * This last possibility doesn't occur because
805 * FETCH_HEAD_IGNORE entries always appear at
806 * the end of the list.
808 die(_("Internal error"));
811 free(ref2
->peer_ref
);
815 struct ref
*ref_remove_duplicates(struct ref
*ref_map
)
817 struct string_list refs
= STRING_LIST_INIT_NODUP
;
818 struct ref
*retval
= NULL
;
819 struct ref
**p
= &retval
;
822 struct ref
*ref
= ref_map
;
824 ref_map
= ref_map
->next
;
827 if (!ref
->peer_ref
) {
831 struct string_list_item
*item
=
832 string_list_insert(&refs
, ref
->peer_ref
->name
);
835 /* Entry already existed */
836 handle_duplicate((struct ref
*)item
->util
, ref
);
845 string_list_clear(&refs
, 0);
849 int remote_has_url(struct remote
*remote
, const char *url
)
852 for (i
= 0; i
< remote
->url_nr
; i
++) {
853 if (!strcmp(remote
->url
[i
], url
))
859 static int match_name_with_pattern(const char *key
, const char *name
,
860 const char *value
, char **result
)
862 const char *kstar
= strchr(key
, '*');
868 die("Key '%s' of pattern had no '*'", key
);
870 ksuffixlen
= strlen(kstar
+ 1);
871 namelen
= strlen(name
);
872 ret
= !strncmp(name
, key
, klen
) && namelen
>= klen
+ ksuffixlen
&&
873 !memcmp(name
+ namelen
- ksuffixlen
, kstar
+ 1, ksuffixlen
);
875 struct strbuf sb
= STRBUF_INIT
;
876 const char *vstar
= strchr(value
, '*');
878 die("Value '%s' of pattern has no '*'", value
);
879 strbuf_add(&sb
, value
, vstar
- value
);
880 strbuf_add(&sb
, name
+ klen
, namelen
- klen
- ksuffixlen
);
881 strbuf_addstr(&sb
, vstar
+ 1);
882 *result
= strbuf_detach(&sb
, NULL
);
887 static void query_refspecs_multiple(struct refspec
*refs
, int ref_count
, struct refspec
*query
, struct string_list
*results
)
890 int find_src
= !query
->src
;
892 if (find_src
&& !query
->dst
)
893 error("query_refspecs_multiple: need either src or dst");
895 for (i
= 0; i
< ref_count
; i
++) {
896 struct refspec
*refspec
= &refs
[i
];
897 const char *key
= find_src
? refspec
->dst
: refspec
->src
;
898 const char *value
= find_src
? refspec
->src
: refspec
->dst
;
899 const char *needle
= find_src
? query
->dst
: query
->src
;
900 char **result
= find_src
? &query
->src
: &query
->dst
;
904 if (refspec
->pattern
) {
905 if (match_name_with_pattern(key
, needle
, value
, result
))
906 string_list_append_nodup(results
, *result
);
907 } else if (!strcmp(needle
, key
)) {
908 string_list_append(results
, value
);
913 int query_refspecs(struct refspec
*refs
, int ref_count
, struct refspec
*query
)
916 int find_src
= !query
->src
;
917 const char *needle
= find_src
? query
->dst
: query
->src
;
918 char **result
= find_src
? &query
->src
: &query
->dst
;
920 if (find_src
&& !query
->dst
)
921 return error("query_refspecs: need either src or dst");
923 for (i
= 0; i
< ref_count
; i
++) {
924 struct refspec
*refspec
= &refs
[i
];
925 const char *key
= find_src
? refspec
->dst
: refspec
->src
;
926 const char *value
= find_src
? refspec
->src
: refspec
->dst
;
930 if (refspec
->pattern
) {
931 if (match_name_with_pattern(key
, needle
, value
, result
)) {
932 query
->force
= refspec
->force
;
935 } else if (!strcmp(needle
, key
)) {
936 *result
= xstrdup(value
);
937 query
->force
= refspec
->force
;
944 char *apply_refspecs(struct refspec
*refspecs
, int nr_refspec
,
947 struct refspec query
;
949 memset(&query
, 0, sizeof(struct refspec
));
950 query
.src
= (char *)name
;
952 if (query_refspecs(refspecs
, nr_refspec
, &query
))
958 int remote_find_tracking(struct remote
*remote
, struct refspec
*refspec
)
960 return query_refspecs(remote
->fetch
, remote
->fetch_refspec_nr
, refspec
);
963 static struct ref
*alloc_ref_with_prefix(const char *prefix
, size_t prefixlen
,
966 size_t len
= strlen(name
);
967 struct ref
*ref
= xcalloc(1, sizeof(struct ref
) + prefixlen
+ len
+ 1);
968 memcpy(ref
->name
, prefix
, prefixlen
);
969 memcpy(ref
->name
+ prefixlen
, name
, len
);
973 struct ref
*alloc_ref(const char *name
)
975 return alloc_ref_with_prefix("", 0, name
);
978 struct ref
*copy_ref(const struct ref
*ref
)
984 len
= strlen(ref
->name
);
985 cpy
= xmalloc(sizeof(struct ref
) + len
+ 1);
986 memcpy(cpy
, ref
, sizeof(struct ref
) + len
+ 1);
988 cpy
->symref
= xstrdup_or_null(ref
->symref
);
989 cpy
->remote_status
= xstrdup_or_null(ref
->remote_status
);
990 cpy
->peer_ref
= copy_ref(ref
->peer_ref
);
994 struct ref
*copy_ref_list(const struct ref
*ref
)
996 struct ref
*ret
= NULL
;
997 struct ref
**tail
= &ret
;
999 *tail
= copy_ref(ref
);
1001 tail
= &((*tail
)->next
);
1006 static void free_ref(struct ref
*ref
)
1010 free_ref(ref
->peer_ref
);
1011 free(ref
->remote_status
);
1016 void free_refs(struct ref
*ref
)
1026 int ref_compare_name(const void *va
, const void *vb
)
1028 const struct ref
*a
= va
, *b
= vb
;
1029 return strcmp(a
->name
, b
->name
);
1032 static void *ref_list_get_next(const void *a
)
1034 return ((const struct ref
*)a
)->next
;
1037 static void ref_list_set_next(void *a
, void *next
)
1039 ((struct ref
*)a
)->next
= next
;
1042 void sort_ref_list(struct ref
**l
, int (*cmp
)(const void *, const void *))
1044 *l
= llist_mergesort(*l
, ref_list_get_next
, ref_list_set_next
, cmp
);
1047 int count_refspec_match(const char *pattern
,
1049 struct ref
**matched_ref
)
1051 int patlen
= strlen(pattern
);
1052 struct ref
*matched_weak
= NULL
;
1053 struct ref
*matched
= NULL
;
1057 for (weak_match
= match
= 0; refs
; refs
= refs
->next
) {
1058 char *name
= refs
->name
;
1059 int namelen
= strlen(name
);
1061 if (!refname_match(pattern
, name
))
1064 /* A match is "weak" if it is with refs outside
1065 * heads or tags, and did not specify the pattern
1066 * in full (e.g. "refs/remotes/origin/master") or at
1067 * least from the toplevel (e.g. "remotes/origin/master");
1068 * otherwise "git push $URL master" would result in
1069 * ambiguity between remotes/origin/master and heads/master
1070 * at the remote site.
1072 if (namelen
!= patlen
&&
1073 patlen
!= namelen
- 5 &&
1074 !starts_with(name
, "refs/heads/") &&
1075 !starts_with(name
, "refs/tags/")) {
1076 /* We want to catch the case where only weak
1077 * matches are found and there are multiple
1078 * matches, and where more than one strong
1079 * matches are found, as ambiguous. One
1080 * strong match with zero or more weak matches
1081 * are acceptable as a unique match.
1083 matched_weak
= refs
;
1093 *matched_ref
= matched_weak
;
1098 *matched_ref
= matched
;
1103 static void tail_link_ref(struct ref
*ref
, struct ref
***tail
)
1111 static struct ref
*alloc_delete_ref(void)
1113 struct ref
*ref
= alloc_ref("(delete)");
1114 hashclr(ref
->new_sha1
);
1118 static int try_explicit_object_name(const char *name
,
1121 unsigned char sha1
[20];
1125 *match
= alloc_delete_ref();
1129 if (get_sha1(name
, sha1
))
1133 *match
= alloc_ref(name
);
1134 hashcpy((*match
)->new_sha1
, sha1
);
1139 static struct ref
*make_linked_ref(const char *name
, struct ref
***tail
)
1141 struct ref
*ret
= alloc_ref(name
);
1142 tail_link_ref(ret
, tail
);
1146 static char *guess_ref(const char *name
, struct ref
*peer
)
1148 struct strbuf buf
= STRBUF_INIT
;
1149 unsigned char sha1
[20];
1151 const char *r
= resolve_ref_unsafe(peer
->name
, RESOLVE_REF_READING
,
1156 if (starts_with(r
, "refs/heads/"))
1157 strbuf_addstr(&buf
, "refs/heads/");
1158 else if (starts_with(r
, "refs/tags/"))
1159 strbuf_addstr(&buf
, "refs/tags/");
1163 strbuf_addstr(&buf
, name
);
1164 return strbuf_detach(&buf
, NULL
);
1167 static int match_explicit_lhs(struct ref
*src
,
1170 int *allocated_match
)
1172 switch (count_refspec_match(rs
->src
, src
, match
)) {
1174 if (allocated_match
)
1175 *allocated_match
= 0;
1178 /* The source could be in the get_sha1() format
1179 * not a reference name. :refs/other is a
1180 * way to delete 'other' ref at the remote end.
1182 if (try_explicit_object_name(rs
->src
, match
) < 0)
1183 return error("src refspec %s does not match any.", rs
->src
);
1184 if (allocated_match
)
1185 *allocated_match
= 1;
1188 return error("src refspec %s matches more than one.", rs
->src
);
1192 static int match_explicit(struct ref
*src
, struct ref
*dst
,
1193 struct ref
***dst_tail
,
1196 struct ref
*matched_src
, *matched_dst
;
1199 const char *dst_value
= rs
->dst
;
1202 if (rs
->pattern
|| rs
->matching
)
1205 matched_src
= matched_dst
= NULL
;
1206 if (match_explicit_lhs(src
, rs
, &matched_src
, &allocated_src
) < 0)
1210 unsigned char sha1
[20];
1213 dst_value
= resolve_ref_unsafe(matched_src
->name
,
1214 RESOLVE_REF_READING
,
1217 ((flag
& REF_ISSYMREF
) &&
1218 !starts_with(dst_value
, "refs/heads/")))
1219 die("%s cannot be resolved to branch.",
1223 switch (count_refspec_match(dst_value
, dst
, &matched_dst
)) {
1227 if (starts_with(dst_value
, "refs/"))
1228 matched_dst
= make_linked_ref(dst_value
, dst_tail
);
1229 else if (is_null_sha1(matched_src
->new_sha1
))
1230 error("unable to delete '%s': remote ref does not exist",
1232 else if ((dst_guess
= guess_ref(dst_value
, matched_src
)))
1233 matched_dst
= make_linked_ref(dst_guess
, dst_tail
);
1235 error("unable to push to unqualified destination: %s\n"
1236 "The destination refspec neither matches an "
1237 "existing ref on the remote nor\n"
1238 "begins with refs/, and we are unable to "
1239 "guess a prefix based on the source ref.",
1244 error("dst refspec %s matches more than one.",
1250 if (matched_dst
->peer_ref
)
1251 return error("dst ref %s receives from more than one src.",
1254 matched_dst
->peer_ref
= allocated_src
?
1256 copy_ref(matched_src
);
1257 matched_dst
->force
= rs
->force
;
1262 static int match_explicit_refs(struct ref
*src
, struct ref
*dst
,
1263 struct ref
***dst_tail
, struct refspec
*rs
,
1267 for (i
= errs
= 0; i
< rs_nr
; i
++)
1268 errs
+= match_explicit(src
, dst
, dst_tail
, &rs
[i
]);
1272 static char *get_ref_match(const struct refspec
*rs
, int rs_nr
, const struct ref
*ref
,
1273 int send_mirror
, int direction
, const struct refspec
**ret_pat
)
1275 const struct refspec
*pat
;
1278 int matching_refs
= -1;
1279 for (i
= 0; i
< rs_nr
; i
++) {
1280 if (rs
[i
].matching
&&
1281 (matching_refs
== -1 || rs
[i
].force
)) {
1286 if (rs
[i
].pattern
) {
1287 const char *dst_side
= rs
[i
].dst
? rs
[i
].dst
: rs
[i
].src
;
1289 if (direction
== FROM_SRC
)
1290 match
= match_name_with_pattern(rs
[i
].src
, ref
->name
, dst_side
, &name
);
1292 match
= match_name_with_pattern(dst_side
, ref
->name
, rs
[i
].src
, &name
);
1299 if (matching_refs
== -1)
1302 pat
= rs
+ matching_refs
;
1303 if (pat
->matching
) {
1305 * "matching refs"; traditionally we pushed everything
1306 * including refs outside refs/heads/ hierarchy, but
1307 * that does not make much sense these days.
1309 if (!send_mirror
&& !starts_with(ref
->name
, "refs/heads/"))
1311 name
= xstrdup(ref
->name
);
1318 static struct ref
**tail_ref(struct ref
**head
)
1320 struct ref
**tail
= head
;
1322 tail
= &((*tail
)->next
);
1327 struct commit
**tip
;
1331 static void add_to_tips(struct tips
*tips
, const unsigned char *sha1
)
1333 struct commit
*commit
;
1335 if (is_null_sha1(sha1
))
1337 commit
= lookup_commit_reference_gently(sha1
, 1);
1338 if (!commit
|| (commit
->object
.flags
& TMP_MARK
))
1340 commit
->object
.flags
|= TMP_MARK
;
1341 ALLOC_GROW(tips
->tip
, tips
->nr
+ 1, tips
->alloc
);
1342 tips
->tip
[tips
->nr
++] = commit
;
1345 static void add_missing_tags(struct ref
*src
, struct ref
**dst
, struct ref
***dst_tail
)
1347 struct string_list dst_tag
= STRING_LIST_INIT_NODUP
;
1348 struct string_list src_tag
= STRING_LIST_INIT_NODUP
;
1349 struct string_list_item
*item
;
1351 struct tips sent_tips
;
1354 * Collect everything we know they would have at the end of
1355 * this push, and collect all tags they have.
1357 memset(&sent_tips
, 0, sizeof(sent_tips
));
1358 for (ref
= *dst
; ref
; ref
= ref
->next
) {
1359 if (ref
->peer_ref
&&
1360 !is_null_sha1(ref
->peer_ref
->new_sha1
))
1361 add_to_tips(&sent_tips
, ref
->peer_ref
->new_sha1
);
1363 add_to_tips(&sent_tips
, ref
->old_sha1
);
1364 if (starts_with(ref
->name
, "refs/tags/"))
1365 string_list_append(&dst_tag
, ref
->name
);
1367 clear_commit_marks_many(sent_tips
.nr
, sent_tips
.tip
, TMP_MARK
);
1369 string_list_sort(&dst_tag
);
1371 /* Collect tags they do not have. */
1372 for (ref
= src
; ref
; ref
= ref
->next
) {
1373 if (!starts_with(ref
->name
, "refs/tags/"))
1374 continue; /* not a tag */
1375 if (string_list_has_string(&dst_tag
, ref
->name
))
1376 continue; /* they already have it */
1377 if (sha1_object_info(ref
->new_sha1
, NULL
) != OBJ_TAG
)
1378 continue; /* be conservative */
1379 item
= string_list_append(&src_tag
, ref
->name
);
1382 string_list_clear(&dst_tag
, 0);
1385 * At this point, src_tag lists tags that are missing from
1386 * dst, and sent_tips lists the tips we are pushing or those
1387 * that we know they already have. An element in the src_tag
1388 * that is an ancestor of any of the sent_tips needs to be
1389 * sent to the other side.
1392 for_each_string_list_item(item
, &src_tag
) {
1393 struct ref
*ref
= item
->util
;
1394 struct ref
*dst_ref
;
1395 struct commit
*commit
;
1397 if (is_null_sha1(ref
->new_sha1
))
1399 commit
= lookup_commit_reference_gently(ref
->new_sha1
, 1);
1401 /* not pushing a commit, which is not an error */
1405 * Is this tag, which they do not have, reachable from
1406 * any of the commits we are sending?
1408 if (!in_merge_bases_many(commit
, sent_tips
.nr
, sent_tips
.tip
))
1412 dst_ref
= make_linked_ref(ref
->name
, dst_tail
);
1413 hashcpy(dst_ref
->new_sha1
, ref
->new_sha1
);
1414 dst_ref
->peer_ref
= copy_ref(ref
);
1417 string_list_clear(&src_tag
, 0);
1418 free(sent_tips
.tip
);
1421 struct ref
*find_ref_by_name(const struct ref
*list
, const char *name
)
1423 for ( ; list
; list
= list
->next
)
1424 if (!strcmp(list
->name
, name
))
1425 return (struct ref
*)list
;
1429 static void prepare_ref_index(struct string_list
*ref_index
, struct ref
*ref
)
1431 for ( ; ref
; ref
= ref
->next
)
1432 string_list_append_nodup(ref_index
, ref
->name
)->util
= ref
;
1434 string_list_sort(ref_index
);
1438 * Given only the set of local refs, sanity-check the set of push
1439 * refspecs. We can't catch all errors that match_push_refs would,
1440 * but we can catch some errors early before even talking to the
1443 int check_push_refs(struct ref
*src
, int nr_refspec
, const char **refspec_names
)
1445 struct refspec
*refspec
= parse_push_refspec(nr_refspec
, refspec_names
);
1449 for (i
= 0; i
< nr_refspec
; i
++) {
1450 struct refspec
*rs
= refspec
+ i
;
1452 if (rs
->pattern
|| rs
->matching
)
1455 ret
|= match_explicit_lhs(src
, rs
, NULL
, NULL
);
1458 free_refspec(nr_refspec
, refspec
);
1463 * Given the set of refs the local repository has, the set of refs the
1464 * remote repository has, and the refspec used for push, determine
1465 * what remote refs we will update and with what value by setting
1466 * peer_ref (which object is being pushed) and force (if the push is
1467 * forced) in elements of "dst". The function may add new elements to
1468 * dst (e.g. pushing to a new branch, done in match_explicit_refs).
1470 int match_push_refs(struct ref
*src
, struct ref
**dst
,
1471 int nr_refspec
, const char **refspec
, int flags
)
1474 int send_all
= flags
& MATCH_REFS_ALL
;
1475 int send_mirror
= flags
& MATCH_REFS_MIRROR
;
1476 int send_prune
= flags
& MATCH_REFS_PRUNE
;
1478 static const char *default_refspec
[] = { ":", NULL
};
1479 struct ref
*ref
, **dst_tail
= tail_ref(dst
);
1480 struct string_list dst_ref_index
= STRING_LIST_INIT_NODUP
;
1484 refspec
= default_refspec
;
1486 rs
= parse_push_refspec(nr_refspec
, (const char **) refspec
);
1487 errs
= match_explicit_refs(src
, *dst
, &dst_tail
, rs
, nr_refspec
);
1489 /* pick the remainder */
1490 for (ref
= src
; ref
; ref
= ref
->next
) {
1491 struct string_list_item
*dst_item
;
1492 struct ref
*dst_peer
;
1493 const struct refspec
*pat
= NULL
;
1496 dst_name
= get_ref_match(rs
, nr_refspec
, ref
, send_mirror
, FROM_SRC
, &pat
);
1500 if (!dst_ref_index
.nr
)
1501 prepare_ref_index(&dst_ref_index
, *dst
);
1503 dst_item
= string_list_lookup(&dst_ref_index
, dst_name
);
1504 dst_peer
= dst_item
? dst_item
->util
: NULL
;
1506 if (dst_peer
->peer_ref
)
1507 /* We're already sending something to this ref. */
1510 if (pat
->matching
&& !(send_all
|| send_mirror
))
1512 * Remote doesn't have it, and we have no
1513 * explicit pattern, and we don't have
1514 * --all or --mirror.
1518 /* Create a new one and link it */
1519 dst_peer
= make_linked_ref(dst_name
, &dst_tail
);
1520 hashcpy(dst_peer
->new_sha1
, ref
->new_sha1
);
1521 string_list_insert(&dst_ref_index
,
1522 dst_peer
->name
)->util
= dst_peer
;
1524 dst_peer
->peer_ref
= copy_ref(ref
);
1525 dst_peer
->force
= pat
->force
;
1530 string_list_clear(&dst_ref_index
, 0);
1532 if (flags
& MATCH_REFS_FOLLOW_TAGS
)
1533 add_missing_tags(src
, dst
, &dst_tail
);
1536 struct string_list src_ref_index
= STRING_LIST_INIT_NODUP
;
1537 /* check for missing refs on the remote */
1538 for (ref
= *dst
; ref
; ref
= ref
->next
) {
1542 /* We're already sending something to this ref. */
1545 src_name
= get_ref_match(rs
, nr_refspec
, ref
, send_mirror
, FROM_DST
, NULL
);
1547 if (!src_ref_index
.nr
)
1548 prepare_ref_index(&src_ref_index
, src
);
1549 if (!string_list_has_string(&src_ref_index
,
1551 ref
->peer_ref
= alloc_delete_ref();
1555 string_list_clear(&src_ref_index
, 0);
1562 void set_ref_status_for_push(struct ref
*remote_refs
, int send_mirror
,
1567 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
1568 int force_ref_update
= ref
->force
|| force_update
;
1569 int reject_reason
= 0;
1572 hashcpy(ref
->new_sha1
, ref
->peer_ref
->new_sha1
);
1573 else if (!send_mirror
)
1576 ref
->deletion
= is_null_sha1(ref
->new_sha1
);
1577 if (!ref
->deletion
&&
1578 !hashcmp(ref
->old_sha1
, ref
->new_sha1
)) {
1579 ref
->status
= REF_STATUS_UPTODATE
;
1584 * Bypass the usual "must fast-forward" check but
1585 * replace it with a weaker "the old value must be
1586 * this value we observed". If the remote ref has
1587 * moved and is now different from what we expect,
1590 * It also is an error if the user told us to check
1591 * with the remote-tracking branch to find the value
1592 * to expect, but we did not have such a tracking
1595 if (ref
->expect_old_sha1
) {
1596 if (ref
->expect_old_no_trackback
||
1597 hashcmp(ref
->old_sha1
, ref
->old_sha1_expect
))
1598 reject_reason
= REF_STATUS_REJECT_STALE
;
1602 * The usual "must fast-forward" rules.
1604 * Decide whether an individual refspec A:B can be
1605 * pushed. The push will succeed if any of the
1606 * following are true:
1608 * (1) the remote reference B does not exist
1610 * (2) the remote reference B is being removed (i.e.,
1611 * pushing :B where no source is specified)
1613 * (3) the destination is not under refs/tags/, and
1614 * if the old and new value is a commit, the new
1615 * is a descendant of the old.
1617 * (4) it is forced using the +A:B notation, or by
1618 * passing the --force argument
1621 else if (!ref
->deletion
&& !is_null_sha1(ref
->old_sha1
)) {
1622 if (starts_with(ref
->name
, "refs/tags/"))
1623 reject_reason
= REF_STATUS_REJECT_ALREADY_EXISTS
;
1624 else if (!has_sha1_file(ref
->old_sha1
))
1625 reject_reason
= REF_STATUS_REJECT_FETCH_FIRST
;
1626 else if (!lookup_commit_reference_gently(ref
->old_sha1
, 1) ||
1627 !lookup_commit_reference_gently(ref
->new_sha1
, 1))
1628 reject_reason
= REF_STATUS_REJECT_NEEDS_FORCE
;
1629 else if (!ref_newer(ref
->new_sha1
, ref
->old_sha1
))
1630 reject_reason
= REF_STATUS_REJECT_NONFASTFORWARD
;
1634 * "--force" will defeat any rejection implemented
1635 * by the rules above.
1637 if (!force_ref_update
)
1638 ref
->status
= reject_reason
;
1639 else if (reject_reason
)
1640 ref
->forced_update
= 1;
1644 static void set_merge(struct branch
*ret
)
1646 struct remote
*remote
;
1648 unsigned char sha1
[20];
1652 return; /* no branch */
1654 return; /* already run */
1655 if (!ret
->remote_name
|| !ret
->merge_nr
) {
1657 * no merge config; let's make sure we don't confuse callers
1658 * with a non-zero merge_nr but a NULL merge
1664 remote
= remote_get(ret
->remote_name
);
1666 ret
->merge
= xcalloc(ret
->merge_nr
, sizeof(*ret
->merge
));
1667 for (i
= 0; i
< ret
->merge_nr
; i
++) {
1668 ret
->merge
[i
] = xcalloc(1, sizeof(**ret
->merge
));
1669 ret
->merge
[i
]->src
= xstrdup(ret
->merge_name
[i
]);
1670 if (!remote_find_tracking(remote
, ret
->merge
[i
]) ||
1671 strcmp(ret
->remote_name
, "."))
1673 if (dwim_ref(ret
->merge_name
[i
], strlen(ret
->merge_name
[i
]),
1675 ret
->merge
[i
]->dst
= ref
;
1677 ret
->merge
[i
]->dst
= xstrdup(ret
->merge_name
[i
]);
1681 struct branch
*branch_get(const char *name
)
1686 if (!name
|| !*name
|| !strcmp(name
, "HEAD"))
1687 ret
= current_branch
;
1689 ret
= make_branch(name
, 0);
1694 int branch_has_merge_config(struct branch
*branch
)
1696 return branch
&& !!branch
->merge
;
1699 int branch_merge_matches(struct branch
*branch
,
1701 const char *refname
)
1703 if (!branch
|| i
< 0 || i
>= branch
->merge_nr
)
1705 return refname_match(branch
->merge
[i
]->src
, refname
);
1708 static int ignore_symref_update(const char *refname
)
1710 unsigned char sha1
[20];
1713 if (!resolve_ref_unsafe(refname
, 0, sha1
, &flag
))
1714 return 0; /* non-existing refs are OK */
1715 return (flag
& REF_ISSYMREF
);
1719 * Create and return a list of (struct ref) consisting of copies of
1720 * each remote_ref that matches refspec. refspec must be a pattern.
1721 * Fill in the copies' peer_ref to describe the local tracking refs to
1722 * which they map. Omit any references that would map to an existing
1723 * local symbolic ref.
1725 static struct ref
*get_expanded_map(const struct ref
*remote_refs
,
1726 const struct refspec
*refspec
)
1728 const struct ref
*ref
;
1729 struct ref
*ret
= NULL
;
1730 struct ref
**tail
= &ret
;
1732 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
1733 char *expn_name
= NULL
;
1735 if (strchr(ref
->name
, '^'))
1736 continue; /* a dereference item */
1737 if (match_name_with_pattern(refspec
->src
, ref
->name
,
1738 refspec
->dst
, &expn_name
) &&
1739 !ignore_symref_update(expn_name
)) {
1740 struct ref
*cpy
= copy_ref(ref
);
1742 cpy
->peer_ref
= alloc_ref(expn_name
);
1744 cpy
->peer_ref
->force
= 1;
1754 static const struct ref
*find_ref_by_name_abbrev(const struct ref
*refs
, const char *name
)
1756 const struct ref
*ref
;
1757 for (ref
= refs
; ref
; ref
= ref
->next
) {
1758 if (refname_match(name
, ref
->name
))
1764 struct ref
*get_remote_ref(const struct ref
*remote_refs
, const char *name
)
1766 const struct ref
*ref
= find_ref_by_name_abbrev(remote_refs
, name
);
1771 return copy_ref(ref
);
1774 static struct ref
*get_local_ref(const char *name
)
1776 if (!name
|| name
[0] == '\0')
1779 if (starts_with(name
, "refs/"))
1780 return alloc_ref(name
);
1782 if (starts_with(name
, "heads/") ||
1783 starts_with(name
, "tags/") ||
1784 starts_with(name
, "remotes/"))
1785 return alloc_ref_with_prefix("refs/", 5, name
);
1787 return alloc_ref_with_prefix("refs/heads/", 11, name
);
1790 int get_fetch_map(const struct ref
*remote_refs
,
1791 const struct refspec
*refspec
,
1795 struct ref
*ref_map
, **rmp
;
1797 if (refspec
->pattern
) {
1798 ref_map
= get_expanded_map(remote_refs
, refspec
);
1800 const char *name
= refspec
->src
[0] ? refspec
->src
: "HEAD";
1802 if (refspec
->exact_sha1
) {
1803 ref_map
= alloc_ref(name
);
1804 get_sha1_hex(name
, ref_map
->old_sha1
);
1806 ref_map
= get_remote_ref(remote_refs
, name
);
1808 if (!missing_ok
&& !ref_map
)
1809 die("Couldn't find remote ref %s", name
);
1811 ref_map
->peer_ref
= get_local_ref(refspec
->dst
);
1812 if (ref_map
->peer_ref
&& refspec
->force
)
1813 ref_map
->peer_ref
->force
= 1;
1817 for (rmp
= &ref_map
; *rmp
; ) {
1818 if ((*rmp
)->peer_ref
) {
1819 if (!starts_with((*rmp
)->peer_ref
->name
, "refs/") ||
1820 check_refname_format((*rmp
)->peer_ref
->name
, 0)) {
1821 struct ref
*ignore
= *rmp
;
1822 error("* Ignoring funny ref '%s' locally",
1823 (*rmp
)->peer_ref
->name
);
1824 *rmp
= (*rmp
)->next
;
1825 free(ignore
->peer_ref
);
1830 rmp
= &((*rmp
)->next
);
1834 tail_link_ref(ref_map
, tail
);
1839 int resolve_remote_symref(struct ref
*ref
, struct ref
*list
)
1843 for (; list
; list
= list
->next
)
1844 if (!strcmp(ref
->symref
, list
->name
)) {
1845 hashcpy(ref
->old_sha1
, list
->old_sha1
);
1851 static void unmark_and_free(struct commit_list
*list
, unsigned int mark
)
1854 struct commit_list
*temp
= list
;
1855 temp
->item
->object
.flags
&= ~mark
;
1861 int ref_newer(const unsigned char *new_sha1
, const unsigned char *old_sha1
)
1864 struct commit
*old
, *new;
1865 struct commit_list
*list
, *used
;
1869 * Both new and old must be commit-ish and new is descendant of
1870 * old. Otherwise we require --force.
1872 o
= deref_tag(parse_object(old_sha1
), NULL
, 0);
1873 if (!o
|| o
->type
!= OBJ_COMMIT
)
1875 old
= (struct commit
*) o
;
1877 o
= deref_tag(parse_object(new_sha1
), NULL
, 0);
1878 if (!o
|| o
->type
!= OBJ_COMMIT
)
1880 new = (struct commit
*) o
;
1882 if (parse_commit(new) < 0)
1886 commit_list_insert(new, &list
);
1888 new = pop_most_recent_commit(&list
, TMP_MARK
);
1889 commit_list_insert(new, &used
);
1895 unmark_and_free(list
, TMP_MARK
);
1896 unmark_and_free(used
, TMP_MARK
);
1901 * Compare a branch with its upstream, and save their differences (number
1902 * of commits) in *num_ours and *num_theirs.
1904 * Return 0 if branch has no upstream (no base), -1 if upstream is missing
1905 * (with "gone" base), otherwise 1 (with base).
1907 int stat_tracking_info(struct branch
*branch
, int *num_ours
, int *num_theirs
)
1909 unsigned char sha1
[20];
1910 struct commit
*ours
, *theirs
;
1912 struct rev_info revs
;
1913 const char *rev_argv
[10], *base
;
1916 /* Cannot stat unless we are marked to build on top of somebody else. */
1918 !branch
->merge
|| !branch
->merge
[0] || !branch
->merge
[0]->dst
)
1921 /* Cannot stat if what we used to build on no longer exists */
1922 base
= branch
->merge
[0]->dst
;
1923 if (read_ref(base
, sha1
))
1925 theirs
= lookup_commit_reference(sha1
);
1929 if (read_ref(branch
->refname
, sha1
))
1931 ours
= lookup_commit_reference(sha1
);
1935 /* are we the same? */
1936 if (theirs
== ours
) {
1937 *num_theirs
= *num_ours
= 0;
1941 /* Run "rev-list --left-right ours...theirs" internally... */
1943 rev_argv
[rev_argc
++] = NULL
;
1944 rev_argv
[rev_argc
++] = "--left-right";
1945 rev_argv
[rev_argc
++] = symmetric
;
1946 rev_argv
[rev_argc
++] = "--";
1947 rev_argv
[rev_argc
] = NULL
;
1949 strcpy(symmetric
, sha1_to_hex(ours
->object
.sha1
));
1950 strcpy(symmetric
+ 40, "...");
1951 strcpy(symmetric
+ 43, sha1_to_hex(theirs
->object
.sha1
));
1953 init_revisions(&revs
, NULL
);
1954 setup_revisions(rev_argc
, rev_argv
, &revs
, NULL
);
1955 if (prepare_revision_walk(&revs
))
1956 die("revision walk setup failed");
1958 /* ... and count the commits on each side. */
1962 struct commit
*c
= get_revision(&revs
);
1965 if (c
->object
.flags
& SYMMETRIC_LEFT
)
1971 /* clear object flags smudged by the above traversal */
1972 clear_commit_marks(ours
, ALL_REV_FLAGS
);
1973 clear_commit_marks(theirs
, ALL_REV_FLAGS
);
1978 * Return true when there is anything to report, otherwise false.
1980 int format_tracking_info(struct branch
*branch
, struct strbuf
*sb
)
1984 int upstream_is_gone
= 0;
1986 switch (stat_tracking_info(branch
, &ours
, &theirs
)) {
1991 /* with "gone" base */
1992 upstream_is_gone
= 1;
1999 base
= shorten_unambiguous_ref(branch
->merge
[0]->dst
, 0);
2000 if (upstream_is_gone
) {
2002 _("Your branch is based on '%s', but the upstream is gone.\n"),
2004 if (advice_status_hints
)
2006 _(" (use \"git branch --unset-upstream\" to fixup)\n"));
2007 } else if (!ours
&& !theirs
) {
2009 _("Your branch is up-to-date with '%s'.\n"),
2011 } else if (!theirs
) {
2013 Q_("Your branch is ahead of '%s' by %d commit.\n",
2014 "Your branch is ahead of '%s' by %d commits.\n",
2017 if (advice_status_hints
)
2019 _(" (use \"git push\" to publish your local commits)\n"));
2022 Q_("Your branch is behind '%s' by %d commit, "
2023 "and can be fast-forwarded.\n",
2024 "Your branch is behind '%s' by %d commits, "
2025 "and can be fast-forwarded.\n",
2028 if (advice_status_hints
)
2030 _(" (use \"git pull\" to update your local branch)\n"));
2033 Q_("Your branch and '%s' have diverged,\n"
2034 "and have %d and %d different commit each, "
2036 "Your branch and '%s' have diverged,\n"
2037 "and have %d and %d different commits each, "
2040 base
, ours
, theirs
);
2041 if (advice_status_hints
)
2043 _(" (use \"git pull\" to merge the remote branch into yours)\n"));
2049 static int one_local_ref(const char *refname
, const unsigned char *sha1
, int flag
, void *cb_data
)
2051 struct ref
***local_tail
= cb_data
;
2055 /* we already know it starts with refs/ to get here */
2056 if (check_refname_format(refname
+ 5, 0))
2059 len
= strlen(refname
) + 1;
2060 ref
= xcalloc(1, sizeof(*ref
) + len
);
2061 hashcpy(ref
->new_sha1
, sha1
);
2062 memcpy(ref
->name
, refname
, len
);
2064 *local_tail
= &ref
->next
;
2068 struct ref
*get_local_heads(void)
2070 struct ref
*local_refs
= NULL
, **local_tail
= &local_refs
;
2071 for_each_ref(one_local_ref
, &local_tail
);
2075 struct ref
*guess_remote_head(const struct ref
*head
,
2076 const struct ref
*refs
,
2079 const struct ref
*r
;
2080 struct ref
*list
= NULL
;
2081 struct ref
**tail
= &list
;
2087 * Some transports support directly peeking at
2088 * where HEAD points; if that is the case, then
2089 * we don't have to guess.
2092 return copy_ref(find_ref_by_name(refs
, head
->symref
));
2094 /* If refs/heads/master could be right, it is. */
2096 r
= find_ref_by_name(refs
, "refs/heads/master");
2097 if (r
&& !hashcmp(r
->old_sha1
, head
->old_sha1
))
2101 /* Look for another ref that points there */
2102 for (r
= refs
; r
; r
= r
->next
) {
2104 starts_with(r
->name
, "refs/heads/") &&
2105 !hashcmp(r
->old_sha1
, head
->old_sha1
)) {
2106 *tail
= copy_ref(r
);
2107 tail
= &((*tail
)->next
);
2116 struct stale_heads_info
{
2117 struct string_list
*ref_names
;
2118 struct ref
**stale_refs_tail
;
2119 struct refspec
*refs
;
2123 static int get_stale_heads_cb(const char *refname
,
2124 const unsigned char *sha1
, int flags
, void *cb_data
)
2126 struct stale_heads_info
*info
= cb_data
;
2127 struct string_list matches
= STRING_LIST_INIT_DUP
;
2128 struct refspec query
;
2130 memset(&query
, 0, sizeof(struct refspec
));
2131 query
.dst
= (char *)refname
;
2133 query_refspecs_multiple(info
->refs
, info
->ref_count
, &query
, &matches
);
2134 if (matches
.nr
== 0)
2135 goto clean_exit
; /* No matches */
2138 * If we did find a suitable refspec and it's not a symref and
2139 * it's not in the list of refs that currently exist in that
2140 * remote, we consider it to be stale. In order to deal with
2141 * overlapping refspecs, we need to go over all of the
2144 if (flags
& REF_ISSYMREF
)
2147 for (i
= 0; stale
&& i
< matches
.nr
; i
++)
2148 if (string_list_has_string(info
->ref_names
, matches
.items
[i
].string
))
2152 struct ref
*ref
= make_linked_ref(refname
, &info
->stale_refs_tail
);
2153 hashcpy(ref
->new_sha1
, sha1
);
2157 string_list_clear(&matches
, 0);
2161 struct ref
*get_stale_heads(struct refspec
*refs
, int ref_count
, struct ref
*fetch_map
)
2163 struct ref
*ref
, *stale_refs
= NULL
;
2164 struct string_list ref_names
= STRING_LIST_INIT_NODUP
;
2165 struct stale_heads_info info
;
2166 info
.ref_names
= &ref_names
;
2167 info
.stale_refs_tail
= &stale_refs
;
2169 info
.ref_count
= ref_count
;
2170 for (ref
= fetch_map
; ref
; ref
= ref
->next
)
2171 string_list_append(&ref_names
, ref
->name
);
2172 string_list_sort(&ref_names
);
2173 for_each_ref(get_stale_heads_cb
, &info
);
2174 string_list_clear(&ref_names
, 0);
2181 static void clear_cas_option(struct push_cas_option
*cas
)
2185 for (i
= 0; i
< cas
->nr
; i
++)
2186 free(cas
->entry
[i
].refname
);
2188 memset(cas
, 0, sizeof(*cas
));
2191 static struct push_cas
*add_cas_entry(struct push_cas_option
*cas
,
2192 const char *refname
,
2195 struct push_cas
*entry
;
2196 ALLOC_GROW(cas
->entry
, cas
->nr
+ 1, cas
->alloc
);
2197 entry
= &cas
->entry
[cas
->nr
++];
2198 memset(entry
, 0, sizeof(*entry
));
2199 entry
->refname
= xmemdupz(refname
, refnamelen
);
2203 int parse_push_cas_option(struct push_cas_option
*cas
, const char *arg
, int unset
)
2206 struct push_cas
*entry
;
2209 /* "--no-<option>" */
2210 clear_cas_option(cas
);
2215 /* just "--<option>" */
2216 cas
->use_tracking_for_rest
= 1;
2220 /* "--<option>=refname" or "--<option>=refname:value" */
2221 colon
= strchrnul(arg
, ':');
2222 entry
= add_cas_entry(cas
, arg
, colon
- arg
);
2224 entry
->use_tracking
= 1;
2225 else if (get_sha1(colon
+ 1, entry
->expect
))
2226 return error("cannot parse expected object name '%s'", colon
+ 1);
2230 int parseopt_push_cas_option(const struct option
*opt
, const char *arg
, int unset
)
2232 return parse_push_cas_option(opt
->value
, arg
, unset
);
2235 int is_empty_cas(const struct push_cas_option
*cas
)
2237 return !cas
->use_tracking_for_rest
&& !cas
->nr
;
2241 * Look at remote.fetch refspec and see if we have a remote
2242 * tracking branch for the refname there. Fill its current
2244 * If we cannot do so, return negative to signal an error.
2246 static int remote_tracking(struct remote
*remote
, const char *refname
,
2247 unsigned char sha1
[20])
2251 dst
= apply_refspecs(remote
->fetch
, remote
->fetch_refspec_nr
, refname
);
2253 return -1; /* no tracking ref for refname at remote */
2254 if (read_ref(dst
, sha1
))
2255 return -1; /* we know what the tracking ref is but we cannot read it */
2259 static void apply_cas(struct push_cas_option
*cas
,
2260 struct remote
*remote
,
2265 /* Find an explicit --<option>=<name>[:<value>] entry */
2266 for (i
= 0; i
< cas
->nr
; i
++) {
2267 struct push_cas
*entry
= &cas
->entry
[i
];
2268 if (!refname_match(entry
->refname
, ref
->name
))
2270 ref
->expect_old_sha1
= 1;
2271 if (!entry
->use_tracking
)
2272 hashcpy(ref
->old_sha1_expect
, cas
->entry
[i
].expect
);
2273 else if (remote_tracking(remote
, ref
->name
, ref
->old_sha1_expect
))
2274 ref
->expect_old_no_trackback
= 1;
2278 /* Are we using "--<option>" to cover all? */
2279 if (!cas
->use_tracking_for_rest
)
2282 ref
->expect_old_sha1
= 1;
2283 if (remote_tracking(remote
, ref
->name
, ref
->old_sha1_expect
))
2284 ref
->expect_old_no_trackback
= 1;
2287 void apply_push_cas(struct push_cas_option
*cas
,
2288 struct remote
*remote
,
2289 struct ref
*remote_refs
)
2292 for (ref
= remote_refs
; ref
; ref
= ref
->next
)
2293 apply_cas(cas
, remote
, ref
);