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 *default_remote_name
;
53 static const char *branch_pushremote_name
;
54 static const char *pushremote_name
;
55 static int explicit_default_remote_name
;
57 static struct rewrites rewrites
;
58 static struct rewrites rewrites_push
;
60 #define BUF_SIZE (2048)
61 static char buffer
[BUF_SIZE
];
63 static int valid_remote(const struct remote
*remote
)
65 return (!!remote
->url
) || (!!remote
->foreign_vcs
);
68 static const char *alias_url(const char *url
, struct rewrites
*r
)
72 struct counted_string
*longest
;
77 for (i
= 0; i
< r
->rewrite_nr
; i
++) {
80 for (j
= 0; j
< r
->rewrite
[i
]->instead_of_nr
; j
++) {
81 if (starts_with(url
, r
->rewrite
[i
]->instead_of
[j
].s
) &&
83 longest
->len
< r
->rewrite
[i
]->instead_of
[j
].len
)) {
84 longest
= &(r
->rewrite
[i
]->instead_of
[j
]);
92 ret
= xmalloc(r
->rewrite
[longest_i
]->baselen
+
93 (strlen(url
) - longest
->len
) + 1);
94 strcpy(ret
, r
->rewrite
[longest_i
]->base
);
95 strcpy(ret
+ r
->rewrite
[longest_i
]->baselen
, url
+ longest
->len
);
99 static void add_push_refspec(struct remote
*remote
, const char *ref
)
101 ALLOC_GROW(remote
->push_refspec
,
102 remote
->push_refspec_nr
+ 1,
103 remote
->push_refspec_alloc
);
104 remote
->push_refspec
[remote
->push_refspec_nr
++] = ref
;
107 static void add_fetch_refspec(struct remote
*remote
, const char *ref
)
109 ALLOC_GROW(remote
->fetch_refspec
,
110 remote
->fetch_refspec_nr
+ 1,
111 remote
->fetch_refspec_alloc
);
112 remote
->fetch_refspec
[remote
->fetch_refspec_nr
++] = ref
;
115 static void add_url(struct remote
*remote
, const char *url
)
117 ALLOC_GROW(remote
->url
, remote
->url_nr
+ 1, remote
->url_alloc
);
118 remote
->url
[remote
->url_nr
++] = url
;
121 static void add_pushurl(struct remote
*remote
, const char *pushurl
)
123 ALLOC_GROW(remote
->pushurl
, remote
->pushurl_nr
+ 1, remote
->pushurl_alloc
);
124 remote
->pushurl
[remote
->pushurl_nr
++] = pushurl
;
127 static void add_pushurl_alias(struct remote
*remote
, const char *url
)
129 const char *pushurl
= alias_url(url
, &rewrites_push
);
131 add_pushurl(remote
, pushurl
);
134 static void add_url_alias(struct remote
*remote
, const char *url
)
136 add_url(remote
, alias_url(url
, &rewrites
));
137 add_pushurl_alias(remote
, url
);
140 struct remotes_hash_key
{
145 static int remotes_hash_cmp(const struct remote
*a
, const struct remote
*b
, const struct remotes_hash_key
*key
)
148 return strncmp(a
->name
, key
->str
, key
->len
) || a
->name
[key
->len
];
150 return strcmp(a
->name
, b
->name
);
153 static inline void init_remotes_hash(void)
155 if (!remotes_hash
.cmpfn
)
156 hashmap_init(&remotes_hash
, (hashmap_cmp_fn
)remotes_hash_cmp
, 0);
159 static struct remote
*make_remote(const char *name
, int len
)
161 struct remote
*ret
, *replaced
;
162 struct remotes_hash_key lookup
;
163 struct hashmap_entry lookup_entry
;
171 hashmap_entry_init(&lookup_entry
, memhash(name
, len
));
173 if ((ret
= hashmap_get(&remotes_hash
, &lookup_entry
, &lookup
)) != NULL
)
176 ret
= xcalloc(1, sizeof(struct remote
));
177 ret
->prune
= -1; /* unspecified */
178 ALLOC_GROW(remotes
, remotes_nr
+ 1, remotes_alloc
);
179 remotes
[remotes_nr
++] = ret
;
180 ret
->name
= xstrndup(name
, len
);
182 hashmap_entry_init(ret
, lookup_entry
.hash
);
183 replaced
= hashmap_put(&remotes_hash
, ret
);
184 assert(replaced
== NULL
); /* no previous entry overwritten */
188 static void add_merge(struct branch
*branch
, const char *name
)
190 ALLOC_GROW(branch
->merge_name
, branch
->merge_nr
+ 1,
191 branch
->merge_alloc
);
192 branch
->merge_name
[branch
->merge_nr
++] = name
;
195 static struct branch
*make_branch(const char *name
, int len
)
200 for (i
= 0; i
< branches_nr
; i
++) {
201 if (len
? (!strncmp(name
, branches
[i
]->name
, len
) &&
202 !branches
[i
]->name
[len
]) :
203 !strcmp(name
, branches
[i
]->name
))
207 ALLOC_GROW(branches
, branches_nr
+ 1, branches_alloc
);
208 ret
= xcalloc(1, sizeof(struct branch
));
209 branches
[branches_nr
++] = ret
;
211 ret
->name
= xstrndup(name
, len
);
213 ret
->name
= xstrdup(name
);
214 ret
->refname
= xstrfmt("refs/heads/%s", ret
->name
);
219 static struct rewrite
*make_rewrite(struct rewrites
*r
, const char *base
, int len
)
224 for (i
= 0; i
< r
->rewrite_nr
; i
++) {
226 ? (len
== r
->rewrite
[i
]->baselen
&&
227 !strncmp(base
, r
->rewrite
[i
]->base
, len
))
228 : !strcmp(base
, r
->rewrite
[i
]->base
))
229 return r
->rewrite
[i
];
232 ALLOC_GROW(r
->rewrite
, r
->rewrite_nr
+ 1, r
->rewrite_alloc
);
233 ret
= xcalloc(1, sizeof(struct rewrite
));
234 r
->rewrite
[r
->rewrite_nr
++] = ret
;
236 ret
->base
= xstrndup(base
, len
);
240 ret
->base
= xstrdup(base
);
241 ret
->baselen
= strlen(base
);
246 static void add_instead_of(struct rewrite
*rewrite
, const char *instead_of
)
248 ALLOC_GROW(rewrite
->instead_of
, rewrite
->instead_of_nr
+ 1, rewrite
->instead_of_alloc
);
249 rewrite
->instead_of
[rewrite
->instead_of_nr
].s
= instead_of
;
250 rewrite
->instead_of
[rewrite
->instead_of_nr
].len
= strlen(instead_of
);
251 rewrite
->instead_of_nr
++;
254 static void read_remotes_file(struct remote
*remote
)
256 FILE *f
= fopen(git_path("remotes/%s", remote
->name
), "r");
260 remote
->origin
= REMOTE_REMOTES
;
261 while (fgets(buffer
, BUF_SIZE
, f
)) {
265 if (starts_with(buffer
, "URL:")) {
268 } else if (starts_with(buffer
, "Push:")) {
271 } else if (starts_with(buffer
, "Pull:")) {
283 while (isspace(p
[-1]))
286 switch (value_list
) {
288 add_url_alias(remote
, xstrdup(s
));
291 add_push_refspec(remote
, xstrdup(s
));
294 add_fetch_refspec(remote
, xstrdup(s
));
301 static void read_branches_file(struct remote
*remote
)
304 struct strbuf branch
= STRBUF_INIT
;
306 FILE *f
= fopen(git_path("branches/%.*s", n
, remote
->name
), "r");
312 s
= fgets(buffer
, BUF_SIZE
, f
);
320 remote
->origin
= REMOTE_BRANCHES
;
322 while (isspace(p
[-1]))
325 p
= xmalloc(len
+ 1);
329 * The branches file would have URL and optionally
330 * #branch specified. The "master" (or specified) branch is
331 * fetched and stored in the local branch of the same name.
333 frag
= strchr(p
, '#');
336 strbuf_addf(&branch
, "refs/heads/%s", frag
);
338 strbuf_addstr(&branch
, "refs/heads/master");
340 strbuf_addf(&branch
, ":refs/heads/%s", remote
->name
);
341 add_url_alias(remote
, p
);
342 add_fetch_refspec(remote
, strbuf_detach(&branch
, NULL
));
344 * Cogito compatible push: push current HEAD to remote #branch
345 * (master if missing)
347 strbuf_init(&branch
, 0);
348 strbuf_addstr(&branch
, "HEAD");
350 strbuf_addf(&branch
, ":refs/heads/%s", frag
);
352 strbuf_addstr(&branch
, ":refs/heads/master");
353 add_push_refspec(remote
, strbuf_detach(&branch
, NULL
));
354 remote
->fetch_tags
= 1; /* always auto-follow */
357 static int handle_config(const char *key
, const char *value
, void *cb
)
361 struct remote
*remote
;
362 struct branch
*branch
;
363 if (starts_with(key
, "branch.")) {
365 subkey
= strrchr(name
, '.');
368 branch
= make_branch(name
, subkey
- name
);
369 if (!strcmp(subkey
, ".remote")) {
370 if (git_config_string(&branch
->remote_name
, key
, value
))
372 if (branch
== current_branch
) {
373 default_remote_name
= branch
->remote_name
;
374 explicit_default_remote_name
= 1;
376 } else if (!strcmp(subkey
, ".pushremote")) {
377 if (branch
== current_branch
)
378 if (git_config_string(&branch_pushremote_name
, key
, value
))
380 } else if (!strcmp(subkey
, ".merge")) {
382 return config_error_nonbool(key
);
383 add_merge(branch
, xstrdup(value
));
387 if (starts_with(key
, "url.")) {
388 struct rewrite
*rewrite
;
390 subkey
= strrchr(name
, '.');
393 if (!strcmp(subkey
, ".insteadof")) {
394 rewrite
= make_rewrite(&rewrites
, name
, subkey
- name
);
396 return config_error_nonbool(key
);
397 add_instead_of(rewrite
, xstrdup(value
));
398 } else if (!strcmp(subkey
, ".pushinsteadof")) {
399 rewrite
= make_rewrite(&rewrites_push
, name
, subkey
- name
);
401 return config_error_nonbool(key
);
402 add_instead_of(rewrite
, xstrdup(value
));
406 if (!starts_with(key
, "remote."))
410 /* Handle remote.* variables */
411 if (!strcmp(name
, "pushdefault"))
412 return git_config_string(&pushremote_name
, key
, value
);
414 /* Handle remote.<name>.* variables */
416 warning("Config remote shorthand cannot begin with '/': %s",
420 subkey
= strrchr(name
, '.');
423 remote
= make_remote(name
, subkey
- name
);
424 remote
->origin
= REMOTE_CONFIG
;
425 if (!strcmp(subkey
, ".mirror"))
426 remote
->mirror
= git_config_bool(key
, value
);
427 else if (!strcmp(subkey
, ".skipdefaultupdate"))
428 remote
->skip_default_update
= git_config_bool(key
, value
);
429 else if (!strcmp(subkey
, ".skipfetchall"))
430 remote
->skip_default_update
= git_config_bool(key
, value
);
431 else if (!strcmp(subkey
, ".prune"))
432 remote
->prune
= git_config_bool(key
, value
);
433 else if (!strcmp(subkey
, ".url")) {
435 if (git_config_string(&v
, key
, value
))
438 } else if (!strcmp(subkey
, ".pushurl")) {
440 if (git_config_string(&v
, key
, value
))
442 add_pushurl(remote
, v
);
443 } else if (!strcmp(subkey
, ".push")) {
445 if (git_config_string(&v
, key
, value
))
447 add_push_refspec(remote
, v
);
448 } else if (!strcmp(subkey
, ".fetch")) {
450 if (git_config_string(&v
, key
, value
))
452 add_fetch_refspec(remote
, v
);
453 } else if (!strcmp(subkey
, ".receivepack")) {
455 if (git_config_string(&v
, key
, value
))
457 if (!remote
->receivepack
)
458 remote
->receivepack
= v
;
460 error("more than one receivepack given, using the first");
461 } else if (!strcmp(subkey
, ".uploadpack")) {
463 if (git_config_string(&v
, key
, value
))
465 if (!remote
->uploadpack
)
466 remote
->uploadpack
= v
;
468 error("more than one uploadpack given, using the first");
469 } else if (!strcmp(subkey
, ".tagopt")) {
470 if (!strcmp(value
, "--no-tags"))
471 remote
->fetch_tags
= -1;
472 else if (!strcmp(value
, "--tags"))
473 remote
->fetch_tags
= 2;
474 } else if (!strcmp(subkey
, ".proxy")) {
475 return git_config_string((const char **)&remote
->http_proxy
,
477 } else if (!strcmp(subkey
, ".vcs")) {
478 return git_config_string(&remote
->foreign_vcs
, key
, value
);
483 static void alias_all_urls(void)
486 for (i
= 0; i
< remotes_nr
; i
++) {
487 int add_pushurl_aliases
;
490 for (j
= 0; j
< remotes
[i
]->pushurl_nr
; j
++) {
491 remotes
[i
]->pushurl
[j
] = alias_url(remotes
[i
]->pushurl
[j
], &rewrites
);
493 add_pushurl_aliases
= remotes
[i
]->pushurl_nr
== 0;
494 for (j
= 0; j
< remotes
[i
]->url_nr
; j
++) {
495 if (add_pushurl_aliases
)
496 add_pushurl_alias(remotes
[i
], remotes
[i
]->url
[j
]);
497 remotes
[i
]->url
[j
] = alias_url(remotes
[i
]->url
[j
], &rewrites
);
502 static void read_config(void)
504 unsigned char sha1
[20];
505 const char *head_ref
;
507 if (default_remote_name
) /* did this already */
509 default_remote_name
= "origin";
510 current_branch
= NULL
;
511 head_ref
= resolve_ref_unsafe("HEAD", sha1
, 0, &flag
);
512 if (head_ref
&& (flag
& REF_ISSYMREF
) &&
513 skip_prefix(head_ref
, "refs/heads/", &head_ref
)) {
514 current_branch
= make_branch(head_ref
, 0);
516 git_config(handle_config
, NULL
);
517 if (branch_pushremote_name
) {
518 free((char *)pushremote_name
);
519 pushremote_name
= branch_pushremote_name
;
525 * This function frees a refspec array.
526 * Warning: code paths should be checked to ensure that the src
527 * and dst pointers are always freeable pointers as well
528 * as the refspec pointer itself.
530 static void free_refspecs(struct refspec
*refspec
, int nr_refspec
)
537 for (i
= 0; i
< nr_refspec
; i
++) {
538 free(refspec
[i
].src
);
539 free(refspec
[i
].dst
);
544 static struct refspec
*parse_refspec_internal(int nr_refspec
, const char **refspec
, int fetch
, int verify
)
547 struct refspec
*rs
= xcalloc(nr_refspec
, sizeof(*rs
));
549 for (i
= 0; i
< nr_refspec
; i
++) {
552 const char *lhs
, *rhs
;
563 rhs
= strrchr(lhs
, ':');
566 * Before going on, special case ":" (or "+:") as a refspec
567 * for pushing matching refs.
569 if (!fetch
&& rhs
== lhs
&& rhs
[1] == '\0') {
575 size_t rlen
= strlen(++rhs
);
576 is_glob
= (1 <= rlen
&& strchr(rhs
, '*'));
577 rs
[i
].dst
= xstrndup(rhs
, rlen
);
580 llen
= (rhs
? (rhs
- lhs
- 1) : strlen(lhs
));
581 if (1 <= llen
&& memchr(lhs
, '*', llen
)) {
582 if ((rhs
&& !is_glob
) || (!rhs
&& fetch
))
585 } else if (rhs
&& is_glob
) {
589 rs
[i
].pattern
= is_glob
;
590 rs
[i
].src
= xstrndup(lhs
, llen
);
591 flags
= REFNAME_ALLOW_ONELEVEL
| (is_glob
? REFNAME_REFSPEC_PATTERN
: 0);
594 unsigned char unused
[40];
598 ; /* empty is ok; it means "HEAD" */
599 else if (llen
== 40 && !get_sha1_hex(rs
[i
].src
, unused
))
600 rs
[i
].exact_sha1
= 1; /* ok */
601 else if (!check_refname_format(rs
[i
].src
, flags
))
602 ; /* valid looking ref is ok */
607 ; /* missing is ok; it is the same as empty */
608 else if (!*rs
[i
].dst
)
609 ; /* empty is ok; it means "do not store" */
610 else if (!check_refname_format(rs
[i
].dst
, flags
))
611 ; /* valid looking ref is ok */
617 * - empty is allowed; it means delete.
618 * - when wildcarded, it must be a valid looking ref.
619 * - otherwise, it must be an extended SHA-1, but
620 * there is no existing way to validate this.
625 if (check_refname_format(rs
[i
].src
, flags
))
629 ; /* anything goes, for now */
632 * - missing is allowed, but LHS then must be a
634 * - empty is not allowed.
635 * - otherwise it must be a valid looking ref.
638 if (check_refname_format(rs
[i
].src
, flags
))
640 } else if (!*rs
[i
].dst
) {
643 if (check_refname_format(rs
[i
].dst
, flags
))
653 * nr_refspec must be greater than zero and i must be valid
654 * since it is only possible to reach this point from within
655 * the for loop above.
657 free_refspecs(rs
, i
+1);
660 die("Invalid refspec '%s'", refspec
[i
]);
663 int valid_fetch_refspec(const char *fetch_refspec_str
)
665 struct refspec
*refspec
;
667 refspec
= parse_refspec_internal(1, &fetch_refspec_str
, 1, 1);
668 free_refspecs(refspec
, 1);
672 struct refspec
*parse_fetch_refspec(int nr_refspec
, const char **refspec
)
674 return parse_refspec_internal(nr_refspec
, refspec
, 1, 0);
677 static struct refspec
*parse_push_refspec(int nr_refspec
, const char **refspec
)
679 return parse_refspec_internal(nr_refspec
, refspec
, 0, 0);
682 void free_refspec(int nr_refspec
, struct refspec
*refspec
)
685 for (i
= 0; i
< nr_refspec
; i
++) {
686 free(refspec
[i
].src
);
687 free(refspec
[i
].dst
);
692 static int valid_remote_nick(const char *name
)
694 if (!name
[0] || is_dot_or_dotdot(name
))
696 return !strchr(name
, '/'); /* no slash */
699 static struct remote
*remote_get_1(const char *name
, const char *pushremote_name
)
707 if (pushremote_name
) {
708 name
= pushremote_name
;
711 name
= default_remote_name
;
712 name_given
= explicit_default_remote_name
;
716 ret
= make_remote(name
, 0);
717 if (valid_remote_nick(name
)) {
718 if (!valid_remote(ret
))
719 read_remotes_file(ret
);
720 if (!valid_remote(ret
))
721 read_branches_file(ret
);
723 if (name_given
&& !valid_remote(ret
))
724 add_url_alias(ret
, name
);
725 if (!valid_remote(ret
))
727 ret
->fetch
= parse_fetch_refspec(ret
->fetch_refspec_nr
, ret
->fetch_refspec
);
728 ret
->push
= parse_push_refspec(ret
->push_refspec_nr
, ret
->push_refspec
);
732 struct remote
*remote_get(const char *name
)
735 return remote_get_1(name
, NULL
);
738 struct remote
*pushremote_get(const char *name
)
741 return remote_get_1(name
, pushremote_name
);
744 int remote_is_configured(const char *name
)
746 struct remotes_hash_key lookup
;
747 struct hashmap_entry lookup_entry
;
752 lookup
.len
= strlen(name
);
753 hashmap_entry_init(&lookup_entry
, memhash(name
, lookup
.len
));
755 return hashmap_get(&remotes_hash
, &lookup_entry
, &lookup
) != NULL
;
758 int for_each_remote(each_remote_fn fn
, void *priv
)
762 for (i
= 0; i
< remotes_nr
&& !result
; i
++) {
763 struct remote
*r
= remotes
[i
];
767 r
->fetch
= parse_fetch_refspec(r
->fetch_refspec_nr
,
770 r
->push
= parse_push_refspec(r
->push_refspec_nr
,
772 result
= fn(r
, priv
);
777 static void handle_duplicate(struct ref
*ref1
, struct ref
*ref2
)
779 if (strcmp(ref1
->name
, ref2
->name
)) {
780 if (ref1
->fetch_head_status
!= FETCH_HEAD_IGNORE
&&
781 ref2
->fetch_head_status
!= FETCH_HEAD_IGNORE
) {
782 die(_("Cannot fetch both %s and %s to %s"),
783 ref1
->name
, ref2
->name
, ref2
->peer_ref
->name
);
784 } else if (ref1
->fetch_head_status
!= FETCH_HEAD_IGNORE
&&
785 ref2
->fetch_head_status
== FETCH_HEAD_IGNORE
) {
786 warning(_("%s usually tracks %s, not %s"),
787 ref2
->peer_ref
->name
, ref2
->name
, ref1
->name
);
788 } else if (ref1
->fetch_head_status
== FETCH_HEAD_IGNORE
&&
789 ref2
->fetch_head_status
== FETCH_HEAD_IGNORE
) {
790 die(_("%s tracks both %s and %s"),
791 ref2
->peer_ref
->name
, ref1
->name
, ref2
->name
);
794 * This last possibility doesn't occur because
795 * FETCH_HEAD_IGNORE entries always appear at
796 * the end of the list.
798 die(_("Internal error"));
801 free(ref2
->peer_ref
);
805 struct ref
*ref_remove_duplicates(struct ref
*ref_map
)
807 struct string_list refs
= STRING_LIST_INIT_NODUP
;
808 struct ref
*retval
= NULL
;
809 struct ref
**p
= &retval
;
812 struct ref
*ref
= ref_map
;
814 ref_map
= ref_map
->next
;
817 if (!ref
->peer_ref
) {
821 struct string_list_item
*item
=
822 string_list_insert(&refs
, ref
->peer_ref
->name
);
825 /* Entry already existed */
826 handle_duplicate((struct ref
*)item
->util
, ref
);
835 string_list_clear(&refs
, 0);
839 int remote_has_url(struct remote
*remote
, const char *url
)
842 for (i
= 0; i
< remote
->url_nr
; i
++) {
843 if (!strcmp(remote
->url
[i
], url
))
849 static int match_name_with_pattern(const char *key
, const char *name
,
850 const char *value
, char **result
)
852 const char *kstar
= strchr(key
, '*');
858 die("Key '%s' of pattern had no '*'", key
);
860 ksuffixlen
= strlen(kstar
+ 1);
861 namelen
= strlen(name
);
862 ret
= !strncmp(name
, key
, klen
) && namelen
>= klen
+ ksuffixlen
&&
863 !memcmp(name
+ namelen
- ksuffixlen
, kstar
+ 1, ksuffixlen
);
865 struct strbuf sb
= STRBUF_INIT
;
866 const char *vstar
= strchr(value
, '*');
868 die("Value '%s' of pattern has no '*'", value
);
869 strbuf_add(&sb
, value
, vstar
- value
);
870 strbuf_add(&sb
, name
+ klen
, namelen
- klen
- ksuffixlen
);
871 strbuf_addstr(&sb
, vstar
+ 1);
872 *result
= strbuf_detach(&sb
, NULL
);
877 static void query_refspecs_multiple(struct refspec
*refs
, int ref_count
, struct refspec
*query
, struct string_list
*results
)
880 int find_src
= !query
->src
;
882 if (find_src
&& !query
->dst
)
883 error("query_refspecs_multiple: need either src or dst");
885 for (i
= 0; i
< ref_count
; i
++) {
886 struct refspec
*refspec
= &refs
[i
];
887 const char *key
= find_src
? refspec
->dst
: refspec
->src
;
888 const char *value
= find_src
? refspec
->src
: refspec
->dst
;
889 const char *needle
= find_src
? query
->dst
: query
->src
;
890 char **result
= find_src
? &query
->src
: &query
->dst
;
894 if (refspec
->pattern
) {
895 if (match_name_with_pattern(key
, needle
, value
, result
))
896 string_list_append_nodup(results
, *result
);
897 } else if (!strcmp(needle
, key
)) {
898 string_list_append(results
, value
);
903 int query_refspecs(struct refspec
*refs
, int ref_count
, struct refspec
*query
)
906 int find_src
= !query
->src
;
907 const char *needle
= find_src
? query
->dst
: query
->src
;
908 char **result
= find_src
? &query
->src
: &query
->dst
;
910 if (find_src
&& !query
->dst
)
911 return error("query_refspecs: need either src or dst");
913 for (i
= 0; i
< ref_count
; i
++) {
914 struct refspec
*refspec
= &refs
[i
];
915 const char *key
= find_src
? refspec
->dst
: refspec
->src
;
916 const char *value
= find_src
? refspec
->src
: refspec
->dst
;
920 if (refspec
->pattern
) {
921 if (match_name_with_pattern(key
, needle
, value
, result
)) {
922 query
->force
= refspec
->force
;
925 } else if (!strcmp(needle
, key
)) {
926 *result
= xstrdup(value
);
927 query
->force
= refspec
->force
;
934 char *apply_refspecs(struct refspec
*refspecs
, int nr_refspec
,
937 struct refspec query
;
939 memset(&query
, 0, sizeof(struct refspec
));
940 query
.src
= (char *)name
;
942 if (query_refspecs(refspecs
, nr_refspec
, &query
))
948 int remote_find_tracking(struct remote
*remote
, struct refspec
*refspec
)
950 return query_refspecs(remote
->fetch
, remote
->fetch_refspec_nr
, refspec
);
953 static struct ref
*alloc_ref_with_prefix(const char *prefix
, size_t prefixlen
,
956 size_t len
= strlen(name
);
957 struct ref
*ref
= xcalloc(1, sizeof(struct ref
) + prefixlen
+ len
+ 1);
958 memcpy(ref
->name
, prefix
, prefixlen
);
959 memcpy(ref
->name
+ prefixlen
, name
, len
);
963 struct ref
*alloc_ref(const char *name
)
965 return alloc_ref_with_prefix("", 0, name
);
968 struct ref
*copy_ref(const struct ref
*ref
)
974 len
= strlen(ref
->name
);
975 cpy
= xmalloc(sizeof(struct ref
) + len
+ 1);
976 memcpy(cpy
, ref
, sizeof(struct ref
) + len
+ 1);
978 cpy
->symref
= xstrdup_or_null(ref
->symref
);
979 cpy
->remote_status
= xstrdup_or_null(ref
->remote_status
);
980 cpy
->peer_ref
= copy_ref(ref
->peer_ref
);
984 struct ref
*copy_ref_list(const struct ref
*ref
)
986 struct ref
*ret
= NULL
;
987 struct ref
**tail
= &ret
;
989 *tail
= copy_ref(ref
);
991 tail
= &((*tail
)->next
);
996 static void free_ref(struct ref
*ref
)
1000 free_ref(ref
->peer_ref
);
1001 free(ref
->remote_status
);
1006 void free_refs(struct ref
*ref
)
1016 int ref_compare_name(const void *va
, const void *vb
)
1018 const struct ref
*a
= va
, *b
= vb
;
1019 return strcmp(a
->name
, b
->name
);
1022 static void *ref_list_get_next(const void *a
)
1024 return ((const struct ref
*)a
)->next
;
1027 static void ref_list_set_next(void *a
, void *next
)
1029 ((struct ref
*)a
)->next
= next
;
1032 void sort_ref_list(struct ref
**l
, int (*cmp
)(const void *, const void *))
1034 *l
= llist_mergesort(*l
, ref_list_get_next
, ref_list_set_next
, cmp
);
1037 int count_refspec_match(const char *pattern
,
1039 struct ref
**matched_ref
)
1041 int patlen
= strlen(pattern
);
1042 struct ref
*matched_weak
= NULL
;
1043 struct ref
*matched
= NULL
;
1047 for (weak_match
= match
= 0; refs
; refs
= refs
->next
) {
1048 char *name
= refs
->name
;
1049 int namelen
= strlen(name
);
1051 if (!refname_match(pattern
, name
))
1054 /* A match is "weak" if it is with refs outside
1055 * heads or tags, and did not specify the pattern
1056 * in full (e.g. "refs/remotes/origin/master") or at
1057 * least from the toplevel (e.g. "remotes/origin/master");
1058 * otherwise "git push $URL master" would result in
1059 * ambiguity between remotes/origin/master and heads/master
1060 * at the remote site.
1062 if (namelen
!= patlen
&&
1063 patlen
!= namelen
- 5 &&
1064 !starts_with(name
, "refs/heads/") &&
1065 !starts_with(name
, "refs/tags/")) {
1066 /* We want to catch the case where only weak
1067 * matches are found and there are multiple
1068 * matches, and where more than one strong
1069 * matches are found, as ambiguous. One
1070 * strong match with zero or more weak matches
1071 * are acceptable as a unique match.
1073 matched_weak
= refs
;
1083 *matched_ref
= matched_weak
;
1088 *matched_ref
= matched
;
1093 static void tail_link_ref(struct ref
*ref
, struct ref
***tail
)
1101 static struct ref
*alloc_delete_ref(void)
1103 struct ref
*ref
= alloc_ref("(delete)");
1104 hashclr(ref
->new_sha1
);
1108 static int try_explicit_object_name(const char *name
,
1111 unsigned char sha1
[20];
1115 *match
= alloc_delete_ref();
1119 if (get_sha1(name
, sha1
))
1123 *match
= alloc_ref(name
);
1124 hashcpy((*match
)->new_sha1
, sha1
);
1129 static struct ref
*make_linked_ref(const char *name
, struct ref
***tail
)
1131 struct ref
*ret
= alloc_ref(name
);
1132 tail_link_ref(ret
, tail
);
1136 static char *guess_ref(const char *name
, struct ref
*peer
)
1138 struct strbuf buf
= STRBUF_INIT
;
1139 unsigned char sha1
[20];
1141 const char *r
= resolve_ref_unsafe(peer
->name
, sha1
, 1, NULL
);
1145 if (starts_with(r
, "refs/heads/"))
1146 strbuf_addstr(&buf
, "refs/heads/");
1147 else if (starts_with(r
, "refs/tags/"))
1148 strbuf_addstr(&buf
, "refs/tags/");
1152 strbuf_addstr(&buf
, name
);
1153 return strbuf_detach(&buf
, NULL
);
1156 static int match_explicit_lhs(struct ref
*src
,
1159 int *allocated_match
)
1161 switch (count_refspec_match(rs
->src
, src
, match
)) {
1163 if (allocated_match
)
1164 *allocated_match
= 0;
1167 /* The source could be in the get_sha1() format
1168 * not a reference name. :refs/other is a
1169 * way to delete 'other' ref at the remote end.
1171 if (try_explicit_object_name(rs
->src
, match
) < 0)
1172 return error("src refspec %s does not match any.", rs
->src
);
1173 if (allocated_match
)
1174 *allocated_match
= 1;
1177 return error("src refspec %s matches more than one.", rs
->src
);
1181 static int match_explicit(struct ref
*src
, struct ref
*dst
,
1182 struct ref
***dst_tail
,
1185 struct ref
*matched_src
, *matched_dst
;
1188 const char *dst_value
= rs
->dst
;
1191 if (rs
->pattern
|| rs
->matching
)
1194 matched_src
= matched_dst
= NULL
;
1195 if (match_explicit_lhs(src
, rs
, &matched_src
, &allocated_src
) < 0)
1199 unsigned char sha1
[20];
1202 dst_value
= resolve_ref_unsafe(matched_src
->name
, sha1
, 1, &flag
);
1204 ((flag
& REF_ISSYMREF
) &&
1205 !starts_with(dst_value
, "refs/heads/")))
1206 die("%s cannot be resolved to branch.",
1210 switch (count_refspec_match(dst_value
, dst
, &matched_dst
)) {
1214 if (starts_with(dst_value
, "refs/"))
1215 matched_dst
= make_linked_ref(dst_value
, dst_tail
);
1216 else if (is_null_sha1(matched_src
->new_sha1
))
1217 error("unable to delete '%s': remote ref does not exist",
1219 else if ((dst_guess
= guess_ref(dst_value
, matched_src
)))
1220 matched_dst
= make_linked_ref(dst_guess
, dst_tail
);
1222 error("unable to push to unqualified destination: %s\n"
1223 "The destination refspec neither matches an "
1224 "existing ref on the remote nor\n"
1225 "begins with refs/, and we are unable to "
1226 "guess a prefix based on the source ref.",
1231 error("dst refspec %s matches more than one.",
1237 if (matched_dst
->peer_ref
)
1238 return error("dst ref %s receives from more than one src.",
1241 matched_dst
->peer_ref
= allocated_src
?
1243 copy_ref(matched_src
);
1244 matched_dst
->force
= rs
->force
;
1249 static int match_explicit_refs(struct ref
*src
, struct ref
*dst
,
1250 struct ref
***dst_tail
, struct refspec
*rs
,
1254 for (i
= errs
= 0; i
< rs_nr
; i
++)
1255 errs
+= match_explicit(src
, dst
, dst_tail
, &rs
[i
]);
1259 static char *get_ref_match(const struct refspec
*rs
, int rs_nr
, const struct ref
*ref
,
1260 int send_mirror
, int direction
, const struct refspec
**ret_pat
)
1262 const struct refspec
*pat
;
1265 int matching_refs
= -1;
1266 for (i
= 0; i
< rs_nr
; i
++) {
1267 if (rs
[i
].matching
&&
1268 (matching_refs
== -1 || rs
[i
].force
)) {
1273 if (rs
[i
].pattern
) {
1274 const char *dst_side
= rs
[i
].dst
? rs
[i
].dst
: rs
[i
].src
;
1276 if (direction
== FROM_SRC
)
1277 match
= match_name_with_pattern(rs
[i
].src
, ref
->name
, dst_side
, &name
);
1279 match
= match_name_with_pattern(dst_side
, ref
->name
, rs
[i
].src
, &name
);
1286 if (matching_refs
== -1)
1289 pat
= rs
+ matching_refs
;
1290 if (pat
->matching
) {
1292 * "matching refs"; traditionally we pushed everything
1293 * including refs outside refs/heads/ hierarchy, but
1294 * that does not make much sense these days.
1296 if (!send_mirror
&& !starts_with(ref
->name
, "refs/heads/"))
1298 name
= xstrdup(ref
->name
);
1305 static struct ref
**tail_ref(struct ref
**head
)
1307 struct ref
**tail
= head
;
1309 tail
= &((*tail
)->next
);
1314 struct commit
**tip
;
1318 static void add_to_tips(struct tips
*tips
, const unsigned char *sha1
)
1320 struct commit
*commit
;
1322 if (is_null_sha1(sha1
))
1324 commit
= lookup_commit_reference_gently(sha1
, 1);
1325 if (!commit
|| (commit
->object
.flags
& TMP_MARK
))
1327 commit
->object
.flags
|= TMP_MARK
;
1328 ALLOC_GROW(tips
->tip
, tips
->nr
+ 1, tips
->alloc
);
1329 tips
->tip
[tips
->nr
++] = commit
;
1332 static void add_missing_tags(struct ref
*src
, struct ref
**dst
, struct ref
***dst_tail
)
1334 struct string_list dst_tag
= STRING_LIST_INIT_NODUP
;
1335 struct string_list src_tag
= STRING_LIST_INIT_NODUP
;
1336 struct string_list_item
*item
;
1338 struct tips sent_tips
;
1341 * Collect everything we know they would have at the end of
1342 * this push, and collect all tags they have.
1344 memset(&sent_tips
, 0, sizeof(sent_tips
));
1345 for (ref
= *dst
; ref
; ref
= ref
->next
) {
1346 if (ref
->peer_ref
&&
1347 !is_null_sha1(ref
->peer_ref
->new_sha1
))
1348 add_to_tips(&sent_tips
, ref
->peer_ref
->new_sha1
);
1350 add_to_tips(&sent_tips
, ref
->old_sha1
);
1351 if (starts_with(ref
->name
, "refs/tags/"))
1352 string_list_append(&dst_tag
, ref
->name
);
1354 clear_commit_marks_many(sent_tips
.nr
, sent_tips
.tip
, TMP_MARK
);
1356 sort_string_list(&dst_tag
);
1358 /* Collect tags they do not have. */
1359 for (ref
= src
; ref
; ref
= ref
->next
) {
1360 if (!starts_with(ref
->name
, "refs/tags/"))
1361 continue; /* not a tag */
1362 if (string_list_has_string(&dst_tag
, ref
->name
))
1363 continue; /* they already have it */
1364 if (sha1_object_info(ref
->new_sha1
, NULL
) != OBJ_TAG
)
1365 continue; /* be conservative */
1366 item
= string_list_append(&src_tag
, ref
->name
);
1369 string_list_clear(&dst_tag
, 0);
1372 * At this point, src_tag lists tags that are missing from
1373 * dst, and sent_tips lists the tips we are pushing or those
1374 * that we know they already have. An element in the src_tag
1375 * that is an ancestor of any of the sent_tips needs to be
1376 * sent to the other side.
1379 for_each_string_list_item(item
, &src_tag
) {
1380 struct ref
*ref
= item
->util
;
1381 struct ref
*dst_ref
;
1382 struct commit
*commit
;
1384 if (is_null_sha1(ref
->new_sha1
))
1386 commit
= lookup_commit_reference_gently(ref
->new_sha1
, 1);
1388 /* not pushing a commit, which is not an error */
1392 * Is this tag, which they do not have, reachable from
1393 * any of the commits we are sending?
1395 if (!in_merge_bases_many(commit
, sent_tips
.nr
, sent_tips
.tip
))
1399 dst_ref
= make_linked_ref(ref
->name
, dst_tail
);
1400 hashcpy(dst_ref
->new_sha1
, ref
->new_sha1
);
1401 dst_ref
->peer_ref
= copy_ref(ref
);
1404 string_list_clear(&src_tag
, 0);
1405 free(sent_tips
.tip
);
1408 struct ref
*find_ref_by_name(const struct ref
*list
, const char *name
)
1410 for ( ; list
; list
= list
->next
)
1411 if (!strcmp(list
->name
, name
))
1412 return (struct ref
*)list
;
1416 static void prepare_ref_index(struct string_list
*ref_index
, struct ref
*ref
)
1418 for ( ; ref
; ref
= ref
->next
)
1419 string_list_append_nodup(ref_index
, ref
->name
)->util
= ref
;
1421 sort_string_list(ref_index
);
1425 * Given only the set of local refs, sanity-check the set of push
1426 * refspecs. We can't catch all errors that match_push_refs would,
1427 * but we can catch some errors early before even talking to the
1430 int check_push_refs(struct ref
*src
, int nr_refspec
, const char **refspec_names
)
1432 struct refspec
*refspec
= parse_push_refspec(nr_refspec
, refspec_names
);
1436 for (i
= 0; i
< nr_refspec
; i
++) {
1437 struct refspec
*rs
= refspec
+ i
;
1439 if (rs
->pattern
|| rs
->matching
)
1442 ret
|= match_explicit_lhs(src
, rs
, NULL
, NULL
);
1445 free_refspec(nr_refspec
, refspec
);
1450 * Given the set of refs the local repository has, the set of refs the
1451 * remote repository has, and the refspec used for push, determine
1452 * what remote refs we will update and with what value by setting
1453 * peer_ref (which object is being pushed) and force (if the push is
1454 * forced) in elements of "dst". The function may add new elements to
1455 * dst (e.g. pushing to a new branch, done in match_explicit_refs).
1457 int match_push_refs(struct ref
*src
, struct ref
**dst
,
1458 int nr_refspec
, const char **refspec
, int flags
)
1461 int send_all
= flags
& MATCH_REFS_ALL
;
1462 int send_mirror
= flags
& MATCH_REFS_MIRROR
;
1463 int send_prune
= flags
& MATCH_REFS_PRUNE
;
1465 static const char *default_refspec
[] = { ":", NULL
};
1466 struct ref
*ref
, **dst_tail
= tail_ref(dst
);
1467 struct string_list dst_ref_index
= STRING_LIST_INIT_NODUP
;
1471 refspec
= default_refspec
;
1473 rs
= parse_push_refspec(nr_refspec
, (const char **) refspec
);
1474 errs
= match_explicit_refs(src
, *dst
, &dst_tail
, rs
, nr_refspec
);
1476 /* pick the remainder */
1477 for (ref
= src
; ref
; ref
= ref
->next
) {
1478 struct string_list_item
*dst_item
;
1479 struct ref
*dst_peer
;
1480 const struct refspec
*pat
= NULL
;
1483 dst_name
= get_ref_match(rs
, nr_refspec
, ref
, send_mirror
, FROM_SRC
, &pat
);
1487 if (!dst_ref_index
.nr
)
1488 prepare_ref_index(&dst_ref_index
, *dst
);
1490 dst_item
= string_list_lookup(&dst_ref_index
, dst_name
);
1491 dst_peer
= dst_item
? dst_item
->util
: NULL
;
1493 if (dst_peer
->peer_ref
)
1494 /* We're already sending something to this ref. */
1497 if (pat
->matching
&& !(send_all
|| send_mirror
))
1499 * Remote doesn't have it, and we have no
1500 * explicit pattern, and we don't have
1501 * --all or --mirror.
1505 /* Create a new one and link it */
1506 dst_peer
= make_linked_ref(dst_name
, &dst_tail
);
1507 hashcpy(dst_peer
->new_sha1
, ref
->new_sha1
);
1508 string_list_insert(&dst_ref_index
,
1509 dst_peer
->name
)->util
= dst_peer
;
1511 dst_peer
->peer_ref
= copy_ref(ref
);
1512 dst_peer
->force
= pat
->force
;
1517 string_list_clear(&dst_ref_index
, 0);
1519 if (flags
& MATCH_REFS_FOLLOW_TAGS
)
1520 add_missing_tags(src
, dst
, &dst_tail
);
1523 struct string_list src_ref_index
= STRING_LIST_INIT_NODUP
;
1524 /* check for missing refs on the remote */
1525 for (ref
= *dst
; ref
; ref
= ref
->next
) {
1529 /* We're already sending something to this ref. */
1532 src_name
= get_ref_match(rs
, nr_refspec
, ref
, send_mirror
, FROM_DST
, NULL
);
1534 if (!src_ref_index
.nr
)
1535 prepare_ref_index(&src_ref_index
, src
);
1536 if (!string_list_has_string(&src_ref_index
,
1538 ref
->peer_ref
= alloc_delete_ref();
1542 string_list_clear(&src_ref_index
, 0);
1549 void set_ref_status_for_push(struct ref
*remote_refs
, int send_mirror
,
1554 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
1555 int force_ref_update
= ref
->force
|| force_update
;
1556 int reject_reason
= 0;
1559 hashcpy(ref
->new_sha1
, ref
->peer_ref
->new_sha1
);
1560 else if (!send_mirror
)
1563 ref
->deletion
= is_null_sha1(ref
->new_sha1
);
1564 if (!ref
->deletion
&&
1565 !hashcmp(ref
->old_sha1
, ref
->new_sha1
)) {
1566 ref
->status
= REF_STATUS_UPTODATE
;
1571 * Bypass the usual "must fast-forward" check but
1572 * replace it with a weaker "the old value must be
1573 * this value we observed". If the remote ref has
1574 * moved and is now different from what we expect,
1577 * It also is an error if the user told us to check
1578 * with the remote-tracking branch to find the value
1579 * to expect, but we did not have such a tracking
1582 if (ref
->expect_old_sha1
) {
1583 if (ref
->expect_old_no_trackback
||
1584 hashcmp(ref
->old_sha1
, ref
->old_sha1_expect
))
1585 reject_reason
= REF_STATUS_REJECT_STALE
;
1589 * The usual "must fast-forward" rules.
1591 * Decide whether an individual refspec A:B can be
1592 * pushed. The push will succeed if any of the
1593 * following are true:
1595 * (1) the remote reference B does not exist
1597 * (2) the remote reference B is being removed (i.e.,
1598 * pushing :B where no source is specified)
1600 * (3) the destination is not under refs/tags/, and
1601 * if the old and new value is a commit, the new
1602 * is a descendant of the old.
1604 * (4) it is forced using the +A:B notation, or by
1605 * passing the --force argument
1608 else if (!ref
->deletion
&& !is_null_sha1(ref
->old_sha1
)) {
1609 if (starts_with(ref
->name
, "refs/tags/"))
1610 reject_reason
= REF_STATUS_REJECT_ALREADY_EXISTS
;
1611 else if (!has_sha1_file(ref
->old_sha1
))
1612 reject_reason
= REF_STATUS_REJECT_FETCH_FIRST
;
1613 else if (!lookup_commit_reference_gently(ref
->old_sha1
, 1) ||
1614 !lookup_commit_reference_gently(ref
->new_sha1
, 1))
1615 reject_reason
= REF_STATUS_REJECT_NEEDS_FORCE
;
1616 else if (!ref_newer(ref
->new_sha1
, ref
->old_sha1
))
1617 reject_reason
= REF_STATUS_REJECT_NONFASTFORWARD
;
1621 * "--force" will defeat any rejection implemented
1622 * by the rules above.
1624 if (!force_ref_update
)
1625 ref
->status
= reject_reason
;
1626 else if (reject_reason
)
1627 ref
->forced_update
= 1;
1631 struct branch
*branch_get(const char *name
)
1636 if (!name
|| !*name
|| !strcmp(name
, "HEAD"))
1637 ret
= current_branch
;
1639 ret
= make_branch(name
, 0);
1640 if (ret
&& ret
->remote_name
) {
1641 ret
->remote
= remote_get(ret
->remote_name
);
1642 if (ret
->merge_nr
) {
1644 ret
->merge
= xcalloc(ret
->merge_nr
, sizeof(*ret
->merge
));
1645 for (i
= 0; i
< ret
->merge_nr
; i
++) {
1646 ret
->merge
[i
] = xcalloc(1, sizeof(**ret
->merge
));
1647 ret
->merge
[i
]->src
= xstrdup(ret
->merge_name
[i
]);
1648 if (remote_find_tracking(ret
->remote
, ret
->merge
[i
])
1649 && !strcmp(ret
->remote_name
, "."))
1650 ret
->merge
[i
]->dst
= xstrdup(ret
->merge_name
[i
]);
1657 int branch_has_merge_config(struct branch
*branch
)
1659 return branch
&& !!branch
->merge
;
1662 int branch_merge_matches(struct branch
*branch
,
1664 const char *refname
)
1666 if (!branch
|| i
< 0 || i
>= branch
->merge_nr
)
1668 return refname_match(branch
->merge
[i
]->src
, refname
);
1671 static int ignore_symref_update(const char *refname
)
1673 unsigned char sha1
[20];
1676 if (!resolve_ref_unsafe(refname
, sha1
, 0, &flag
))
1677 return 0; /* non-existing refs are OK */
1678 return (flag
& REF_ISSYMREF
);
1682 * Create and return a list of (struct ref) consisting of copies of
1683 * each remote_ref that matches refspec. refspec must be a pattern.
1684 * Fill in the copies' peer_ref to describe the local tracking refs to
1685 * which they map. Omit any references that would map to an existing
1686 * local symbolic ref.
1688 static struct ref
*get_expanded_map(const struct ref
*remote_refs
,
1689 const struct refspec
*refspec
)
1691 const struct ref
*ref
;
1692 struct ref
*ret
= NULL
;
1693 struct ref
**tail
= &ret
;
1695 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
1696 char *expn_name
= NULL
;
1698 if (strchr(ref
->name
, '^'))
1699 continue; /* a dereference item */
1700 if (match_name_with_pattern(refspec
->src
, ref
->name
,
1701 refspec
->dst
, &expn_name
) &&
1702 !ignore_symref_update(expn_name
)) {
1703 struct ref
*cpy
= copy_ref(ref
);
1705 cpy
->peer_ref
= alloc_ref(expn_name
);
1707 cpy
->peer_ref
->force
= 1;
1717 static const struct ref
*find_ref_by_name_abbrev(const struct ref
*refs
, const char *name
)
1719 const struct ref
*ref
;
1720 for (ref
= refs
; ref
; ref
= ref
->next
) {
1721 if (refname_match(name
, ref
->name
))
1727 struct ref
*get_remote_ref(const struct ref
*remote_refs
, const char *name
)
1729 const struct ref
*ref
= find_ref_by_name_abbrev(remote_refs
, name
);
1734 return copy_ref(ref
);
1737 static struct ref
*get_local_ref(const char *name
)
1739 if (!name
|| name
[0] == '\0')
1742 if (starts_with(name
, "refs/"))
1743 return alloc_ref(name
);
1745 if (starts_with(name
, "heads/") ||
1746 starts_with(name
, "tags/") ||
1747 starts_with(name
, "remotes/"))
1748 return alloc_ref_with_prefix("refs/", 5, name
);
1750 return alloc_ref_with_prefix("refs/heads/", 11, name
);
1753 int get_fetch_map(const struct ref
*remote_refs
,
1754 const struct refspec
*refspec
,
1758 struct ref
*ref_map
, **rmp
;
1760 if (refspec
->pattern
) {
1761 ref_map
= get_expanded_map(remote_refs
, refspec
);
1763 const char *name
= refspec
->src
[0] ? refspec
->src
: "HEAD";
1765 if (refspec
->exact_sha1
) {
1766 ref_map
= alloc_ref(name
);
1767 get_sha1_hex(name
, ref_map
->old_sha1
);
1769 ref_map
= get_remote_ref(remote_refs
, name
);
1771 if (!missing_ok
&& !ref_map
)
1772 die("Couldn't find remote ref %s", name
);
1774 ref_map
->peer_ref
= get_local_ref(refspec
->dst
);
1775 if (ref_map
->peer_ref
&& refspec
->force
)
1776 ref_map
->peer_ref
->force
= 1;
1780 for (rmp
= &ref_map
; *rmp
; ) {
1781 if ((*rmp
)->peer_ref
) {
1782 if (!starts_with((*rmp
)->peer_ref
->name
, "refs/") ||
1783 check_refname_format((*rmp
)->peer_ref
->name
, 0)) {
1784 struct ref
*ignore
= *rmp
;
1785 error("* Ignoring funny ref '%s' locally",
1786 (*rmp
)->peer_ref
->name
);
1787 *rmp
= (*rmp
)->next
;
1788 free(ignore
->peer_ref
);
1793 rmp
= &((*rmp
)->next
);
1797 tail_link_ref(ref_map
, tail
);
1802 int resolve_remote_symref(struct ref
*ref
, struct ref
*list
)
1806 for (; list
; list
= list
->next
)
1807 if (!strcmp(ref
->symref
, list
->name
)) {
1808 hashcpy(ref
->old_sha1
, list
->old_sha1
);
1814 static void unmark_and_free(struct commit_list
*list
, unsigned int mark
)
1817 struct commit_list
*temp
= list
;
1818 temp
->item
->object
.flags
&= ~mark
;
1824 int ref_newer(const unsigned char *new_sha1
, const unsigned char *old_sha1
)
1827 struct commit
*old
, *new;
1828 struct commit_list
*list
, *used
;
1832 * Both new and old must be commit-ish and new is descendant of
1833 * old. Otherwise we require --force.
1835 o
= deref_tag(parse_object(old_sha1
), NULL
, 0);
1836 if (!o
|| o
->type
!= OBJ_COMMIT
)
1838 old
= (struct commit
*) o
;
1840 o
= deref_tag(parse_object(new_sha1
), NULL
, 0);
1841 if (!o
|| o
->type
!= OBJ_COMMIT
)
1843 new = (struct commit
*) o
;
1845 if (parse_commit(new) < 0)
1849 commit_list_insert(new, &list
);
1851 new = pop_most_recent_commit(&list
, TMP_MARK
);
1852 commit_list_insert(new, &used
);
1858 unmark_and_free(list
, TMP_MARK
);
1859 unmark_and_free(used
, TMP_MARK
);
1864 * Compare a branch with its upstream, and save their differences (number
1865 * of commits) in *num_ours and *num_theirs.
1867 * Return 0 if branch has no upstream (no base), -1 if upstream is missing
1868 * (with "gone" base), otherwise 1 (with base).
1870 int stat_tracking_info(struct branch
*branch
, int *num_ours
, int *num_theirs
)
1872 unsigned char sha1
[20];
1873 struct commit
*ours
, *theirs
;
1875 struct rev_info revs
;
1876 const char *rev_argv
[10], *base
;
1879 /* Cannot stat unless we are marked to build on top of somebody else. */
1881 !branch
->merge
|| !branch
->merge
[0] || !branch
->merge
[0]->dst
)
1884 /* Cannot stat if what we used to build on no longer exists */
1885 base
= branch
->merge
[0]->dst
;
1886 if (read_ref(base
, sha1
))
1888 theirs
= lookup_commit_reference(sha1
);
1892 if (read_ref(branch
->refname
, sha1
))
1894 ours
= lookup_commit_reference(sha1
);
1898 /* are we the same? */
1899 if (theirs
== ours
) {
1900 *num_theirs
= *num_ours
= 0;
1904 /* Run "rev-list --left-right ours...theirs" internally... */
1906 rev_argv
[rev_argc
++] = NULL
;
1907 rev_argv
[rev_argc
++] = "--left-right";
1908 rev_argv
[rev_argc
++] = symmetric
;
1909 rev_argv
[rev_argc
++] = "--";
1910 rev_argv
[rev_argc
] = NULL
;
1912 strcpy(symmetric
, sha1_to_hex(ours
->object
.sha1
));
1913 strcpy(symmetric
+ 40, "...");
1914 strcpy(symmetric
+ 43, sha1_to_hex(theirs
->object
.sha1
));
1916 init_revisions(&revs
, NULL
);
1917 setup_revisions(rev_argc
, rev_argv
, &revs
, NULL
);
1918 if (prepare_revision_walk(&revs
))
1919 die("revision walk setup failed");
1921 /* ... and count the commits on each side. */
1925 struct commit
*c
= get_revision(&revs
);
1928 if (c
->object
.flags
& SYMMETRIC_LEFT
)
1934 /* clear object flags smudged by the above traversal */
1935 clear_commit_marks(ours
, ALL_REV_FLAGS
);
1936 clear_commit_marks(theirs
, ALL_REV_FLAGS
);
1941 * Return true when there is anything to report, otherwise false.
1943 int format_tracking_info(struct branch
*branch
, struct strbuf
*sb
)
1947 int upstream_is_gone
= 0;
1949 switch (stat_tracking_info(branch
, &ours
, &theirs
)) {
1954 /* with "gone" base */
1955 upstream_is_gone
= 1;
1962 base
= shorten_unambiguous_ref(branch
->merge
[0]->dst
, 0);
1963 if (upstream_is_gone
) {
1965 _("Your branch is based on '%s', but the upstream is gone.\n"),
1967 if (advice_status_hints
)
1969 _(" (use \"git branch --unset-upstream\" to fixup)\n"));
1970 } else if (!ours
&& !theirs
) {
1972 _("Your branch is up-to-date with '%s'.\n"),
1974 } else if (!theirs
) {
1976 Q_("Your branch is ahead of '%s' by %d commit.\n",
1977 "Your branch is ahead of '%s' by %d commits.\n",
1980 if (advice_status_hints
)
1982 _(" (use \"git push\" to publish your local commits)\n"));
1985 Q_("Your branch is behind '%s' by %d commit, "
1986 "and can be fast-forwarded.\n",
1987 "Your branch is behind '%s' by %d commits, "
1988 "and can be fast-forwarded.\n",
1991 if (advice_status_hints
)
1993 _(" (use \"git pull\" to update your local branch)\n"));
1996 Q_("Your branch and '%s' have diverged,\n"
1997 "and have %d and %d different commit each, "
1999 "Your branch and '%s' have diverged,\n"
2000 "and have %d and %d different commits each, "
2003 base
, ours
, theirs
);
2004 if (advice_status_hints
)
2006 _(" (use \"git pull\" to merge the remote branch into yours)\n"));
2012 static int one_local_ref(const char *refname
, const unsigned char *sha1
, int flag
, void *cb_data
)
2014 struct ref
***local_tail
= cb_data
;
2018 /* we already know it starts with refs/ to get here */
2019 if (check_refname_format(refname
+ 5, 0))
2022 len
= strlen(refname
) + 1;
2023 ref
= xcalloc(1, sizeof(*ref
) + len
);
2024 hashcpy(ref
->new_sha1
, sha1
);
2025 memcpy(ref
->name
, refname
, len
);
2027 *local_tail
= &ref
->next
;
2031 struct ref
*get_local_heads(void)
2033 struct ref
*local_refs
= NULL
, **local_tail
= &local_refs
;
2034 for_each_ref(one_local_ref
, &local_tail
);
2038 struct ref
*guess_remote_head(const struct ref
*head
,
2039 const struct ref
*refs
,
2042 const struct ref
*r
;
2043 struct ref
*list
= NULL
;
2044 struct ref
**tail
= &list
;
2050 * Some transports support directly peeking at
2051 * where HEAD points; if that is the case, then
2052 * we don't have to guess.
2055 return copy_ref(find_ref_by_name(refs
, head
->symref
));
2057 /* If refs/heads/master could be right, it is. */
2059 r
= find_ref_by_name(refs
, "refs/heads/master");
2060 if (r
&& !hashcmp(r
->old_sha1
, head
->old_sha1
))
2064 /* Look for another ref that points there */
2065 for (r
= refs
; r
; r
= r
->next
) {
2067 starts_with(r
->name
, "refs/heads/") &&
2068 !hashcmp(r
->old_sha1
, head
->old_sha1
)) {
2069 *tail
= copy_ref(r
);
2070 tail
= &((*tail
)->next
);
2079 struct stale_heads_info
{
2080 struct string_list
*ref_names
;
2081 struct ref
**stale_refs_tail
;
2082 struct refspec
*refs
;
2086 static int get_stale_heads_cb(const char *refname
,
2087 const unsigned char *sha1
, int flags
, void *cb_data
)
2089 struct stale_heads_info
*info
= cb_data
;
2090 struct string_list matches
= STRING_LIST_INIT_DUP
;
2091 struct refspec query
;
2093 memset(&query
, 0, sizeof(struct refspec
));
2094 query
.dst
= (char *)refname
;
2096 query_refspecs_multiple(info
->refs
, info
->ref_count
, &query
, &matches
);
2097 if (matches
.nr
== 0)
2098 goto clean_exit
; /* No matches */
2101 * If we did find a suitable refspec and it's not a symref and
2102 * it's not in the list of refs that currently exist in that
2103 * remote, we consider it to be stale. In order to deal with
2104 * overlapping refspecs, we need to go over all of the
2107 if (flags
& REF_ISSYMREF
)
2110 for (i
= 0; stale
&& i
< matches
.nr
; i
++)
2111 if (string_list_has_string(info
->ref_names
, matches
.items
[i
].string
))
2115 struct ref
*ref
= make_linked_ref(refname
, &info
->stale_refs_tail
);
2116 hashcpy(ref
->new_sha1
, sha1
);
2120 string_list_clear(&matches
, 0);
2124 struct ref
*get_stale_heads(struct refspec
*refs
, int ref_count
, struct ref
*fetch_map
)
2126 struct ref
*ref
, *stale_refs
= NULL
;
2127 struct string_list ref_names
= STRING_LIST_INIT_NODUP
;
2128 struct stale_heads_info info
;
2129 info
.ref_names
= &ref_names
;
2130 info
.stale_refs_tail
= &stale_refs
;
2132 info
.ref_count
= ref_count
;
2133 for (ref
= fetch_map
; ref
; ref
= ref
->next
)
2134 string_list_append(&ref_names
, ref
->name
);
2135 sort_string_list(&ref_names
);
2136 for_each_ref(get_stale_heads_cb
, &info
);
2137 string_list_clear(&ref_names
, 0);
2144 void clear_cas_option(struct push_cas_option
*cas
)
2148 for (i
= 0; i
< cas
->nr
; i
++)
2149 free(cas
->entry
[i
].refname
);
2151 memset(cas
, 0, sizeof(*cas
));
2154 static struct push_cas
*add_cas_entry(struct push_cas_option
*cas
,
2155 const char *refname
,
2158 struct push_cas
*entry
;
2159 ALLOC_GROW(cas
->entry
, cas
->nr
+ 1, cas
->alloc
);
2160 entry
= &cas
->entry
[cas
->nr
++];
2161 memset(entry
, 0, sizeof(*entry
));
2162 entry
->refname
= xmemdupz(refname
, refnamelen
);
2166 int parse_push_cas_option(struct push_cas_option
*cas
, const char *arg
, int unset
)
2169 struct push_cas
*entry
;
2172 /* "--no-<option>" */
2173 clear_cas_option(cas
);
2178 /* just "--<option>" */
2179 cas
->use_tracking_for_rest
= 1;
2183 /* "--<option>=refname" or "--<option>=refname:value" */
2184 colon
= strchrnul(arg
, ':');
2185 entry
= add_cas_entry(cas
, arg
, colon
- arg
);
2187 entry
->use_tracking
= 1;
2188 else if (get_sha1(colon
+ 1, entry
->expect
))
2189 return error("cannot parse expected object name '%s'", colon
+ 1);
2193 int parseopt_push_cas_option(const struct option
*opt
, const char *arg
, int unset
)
2195 return parse_push_cas_option(opt
->value
, arg
, unset
);
2198 int is_empty_cas(const struct push_cas_option
*cas
)
2200 return !cas
->use_tracking_for_rest
&& !cas
->nr
;
2204 * Look at remote.fetch refspec and see if we have a remote
2205 * tracking branch for the refname there. Fill its current
2207 * If we cannot do so, return negative to signal an error.
2209 static int remote_tracking(struct remote
*remote
, const char *refname
,
2210 unsigned char sha1
[20])
2214 dst
= apply_refspecs(remote
->fetch
, remote
->fetch_refspec_nr
, refname
);
2216 return -1; /* no tracking ref for refname at remote */
2217 if (read_ref(dst
, sha1
))
2218 return -1; /* we know what the tracking ref is but we cannot read it */
2222 static void apply_cas(struct push_cas_option
*cas
,
2223 struct remote
*remote
,
2228 /* Find an explicit --<option>=<name>[:<value>] entry */
2229 for (i
= 0; i
< cas
->nr
; i
++) {
2230 struct push_cas
*entry
= &cas
->entry
[i
];
2231 if (!refname_match(entry
->refname
, ref
->name
))
2233 ref
->expect_old_sha1
= 1;
2234 if (!entry
->use_tracking
)
2235 hashcpy(ref
->old_sha1_expect
, cas
->entry
[i
].expect
);
2236 else if (remote_tracking(remote
, ref
->name
, ref
->old_sha1_expect
))
2237 ref
->expect_old_no_trackback
= 1;
2241 /* Are we using "--<option>" to cover all? */
2242 if (!cas
->use_tracking_for_rest
)
2245 ref
->expect_old_sha1
= 1;
2246 if (remote_tracking(remote
, ref
->name
, ref
->old_sha1_expect
))
2247 ref
->expect_old_no_trackback
= 1;
2250 void apply_push_cas(struct push_cas_option
*cas
,
2251 struct remote
*remote
,
2252 struct ref
*remote_refs
)
2255 for (ref
= remote_refs
; ref
; ref
= ref
->next
)
2256 apply_cas(cas
, remote
, ref
);