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
;
46 static struct branch
**branches
;
47 static int branches_alloc
;
48 static int branches_nr
;
50 static struct branch
*current_branch
;
51 static const char *default_remote_name
;
52 static const char *pushremote_name
;
53 static int explicit_default_remote_name
;
55 static struct rewrites rewrites
;
56 static struct rewrites rewrites_push
;
58 #define BUF_SIZE (2048)
59 static char buffer
[BUF_SIZE
];
61 static int valid_remote(const struct remote
*remote
)
63 return (!!remote
->url
) || (!!remote
->foreign_vcs
);
66 static const char *alias_url(const char *url
, struct rewrites
*r
)
70 struct counted_string
*longest
;
75 for (i
= 0; i
< r
->rewrite_nr
; i
++) {
78 for (j
= 0; j
< r
->rewrite
[i
]->instead_of_nr
; j
++) {
79 if (starts_with(url
, r
->rewrite
[i
]->instead_of
[j
].s
) &&
81 longest
->len
< r
->rewrite
[i
]->instead_of
[j
].len
)) {
82 longest
= &(r
->rewrite
[i
]->instead_of
[j
]);
90 ret
= xmalloc(r
->rewrite
[longest_i
]->baselen
+
91 (strlen(url
) - longest
->len
) + 1);
92 strcpy(ret
, r
->rewrite
[longest_i
]->base
);
93 strcpy(ret
+ r
->rewrite
[longest_i
]->baselen
, url
+ longest
->len
);
97 static void add_push_refspec(struct remote
*remote
, const char *ref
)
99 ALLOC_GROW(remote
->push_refspec
,
100 remote
->push_refspec_nr
+ 1,
101 remote
->push_refspec_alloc
);
102 remote
->push_refspec
[remote
->push_refspec_nr
++] = ref
;
105 static void add_fetch_refspec(struct remote
*remote
, const char *ref
)
107 ALLOC_GROW(remote
->fetch_refspec
,
108 remote
->fetch_refspec_nr
+ 1,
109 remote
->fetch_refspec_alloc
);
110 remote
->fetch_refspec
[remote
->fetch_refspec_nr
++] = ref
;
113 static void add_url(struct remote
*remote
, const char *url
)
115 ALLOC_GROW(remote
->url
, remote
->url_nr
+ 1, remote
->url_alloc
);
116 remote
->url
[remote
->url_nr
++] = url
;
119 static void add_pushurl(struct remote
*remote
, const char *pushurl
)
121 ALLOC_GROW(remote
->pushurl
, remote
->pushurl_nr
+ 1, remote
->pushurl_alloc
);
122 remote
->pushurl
[remote
->pushurl_nr
++] = pushurl
;
125 static void add_pushurl_alias(struct remote
*remote
, const char *url
)
127 const char *pushurl
= alias_url(url
, &rewrites_push
);
129 add_pushurl(remote
, pushurl
);
132 static void add_url_alias(struct remote
*remote
, const char *url
)
134 add_url(remote
, alias_url(url
, &rewrites
));
135 add_pushurl_alias(remote
, url
);
138 static struct remote
*make_remote(const char *name
, int len
)
143 for (i
= 0; i
< remotes_nr
; i
++) {
144 if (len
? (!strncmp(name
, remotes
[i
]->name
, len
) &&
145 !remotes
[i
]->name
[len
]) :
146 !strcmp(name
, remotes
[i
]->name
))
150 ret
= xcalloc(1, sizeof(struct remote
));
151 ret
->prune
= -1; /* unspecified */
152 ALLOC_GROW(remotes
, remotes_nr
+ 1, remotes_alloc
);
153 remotes
[remotes_nr
++] = ret
;
155 ret
->name
= xstrndup(name
, len
);
157 ret
->name
= xstrdup(name
);
161 static void add_merge(struct branch
*branch
, const char *name
)
163 ALLOC_GROW(branch
->merge_name
, branch
->merge_nr
+ 1,
164 branch
->merge_alloc
);
165 branch
->merge_name
[branch
->merge_nr
++] = name
;
168 static struct branch
*make_branch(const char *name
, int len
)
174 for (i
= 0; i
< branches_nr
; i
++) {
175 if (len
? (!strncmp(name
, branches
[i
]->name
, len
) &&
176 !branches
[i
]->name
[len
]) :
177 !strcmp(name
, branches
[i
]->name
))
181 ALLOC_GROW(branches
, branches_nr
+ 1, branches_alloc
);
182 ret
= xcalloc(1, sizeof(struct branch
));
183 branches
[branches_nr
++] = ret
;
185 ret
->name
= xstrndup(name
, len
);
187 ret
->name
= xstrdup(name
);
188 refname
= xmalloc(strlen(name
) + strlen("refs/heads/") + 1);
189 strcpy(refname
, "refs/heads/");
190 strcpy(refname
+ strlen("refs/heads/"), ret
->name
);
191 ret
->refname
= refname
;
196 static struct rewrite
*make_rewrite(struct rewrites
*r
, const char *base
, int len
)
201 for (i
= 0; i
< r
->rewrite_nr
; i
++) {
203 ? (len
== r
->rewrite
[i
]->baselen
&&
204 !strncmp(base
, r
->rewrite
[i
]->base
, len
))
205 : !strcmp(base
, r
->rewrite
[i
]->base
))
206 return r
->rewrite
[i
];
209 ALLOC_GROW(r
->rewrite
, r
->rewrite_nr
+ 1, r
->rewrite_alloc
);
210 ret
= xcalloc(1, sizeof(struct rewrite
));
211 r
->rewrite
[r
->rewrite_nr
++] = ret
;
213 ret
->base
= xstrndup(base
, len
);
217 ret
->base
= xstrdup(base
);
218 ret
->baselen
= strlen(base
);
223 static void add_instead_of(struct rewrite
*rewrite
, const char *instead_of
)
225 ALLOC_GROW(rewrite
->instead_of
, rewrite
->instead_of_nr
+ 1, rewrite
->instead_of_alloc
);
226 rewrite
->instead_of
[rewrite
->instead_of_nr
].s
= instead_of
;
227 rewrite
->instead_of
[rewrite
->instead_of_nr
].len
= strlen(instead_of
);
228 rewrite
->instead_of_nr
++;
231 static void read_remotes_file(struct remote
*remote
)
233 FILE *f
= fopen(git_path("remotes/%s", remote
->name
), "r");
237 remote
->origin
= REMOTE_REMOTES
;
238 while (fgets(buffer
, BUF_SIZE
, f
)) {
242 if (starts_with(buffer
, "URL:")) {
245 } else if (starts_with(buffer
, "Push:")) {
248 } else if (starts_with(buffer
, "Pull:")) {
260 while (isspace(p
[-1]))
263 switch (value_list
) {
265 add_url_alias(remote
, xstrdup(s
));
268 add_push_refspec(remote
, xstrdup(s
));
271 add_fetch_refspec(remote
, xstrdup(s
));
278 static void read_branches_file(struct remote
*remote
)
281 struct strbuf branch
= STRBUF_INIT
;
283 FILE *f
= fopen(git_path("branches/%.*s", n
, remote
->name
), "r");
289 s
= fgets(buffer
, BUF_SIZE
, f
);
297 remote
->origin
= REMOTE_BRANCHES
;
299 while (isspace(p
[-1]))
302 p
= xmalloc(len
+ 1);
306 * The branches file would have URL and optionally
307 * #branch specified. The "master" (or specified) branch is
308 * fetched and stored in the local branch of the same name.
310 frag
= strchr(p
, '#');
313 strbuf_addf(&branch
, "refs/heads/%s", frag
);
315 strbuf_addstr(&branch
, "refs/heads/master");
317 strbuf_addf(&branch
, ":refs/heads/%s", remote
->name
);
318 add_url_alias(remote
, p
);
319 add_fetch_refspec(remote
, strbuf_detach(&branch
, NULL
));
321 * Cogito compatible push: push current HEAD to remote #branch
322 * (master if missing)
324 strbuf_init(&branch
, 0);
325 strbuf_addstr(&branch
, "HEAD");
327 strbuf_addf(&branch
, ":refs/heads/%s", frag
);
329 strbuf_addstr(&branch
, ":refs/heads/master");
330 add_push_refspec(remote
, strbuf_detach(&branch
, NULL
));
331 remote
->fetch_tags
= 1; /* always auto-follow */
334 static int handle_config(const char *key
, const char *value
, void *cb
)
338 struct remote
*remote
;
339 struct branch
*branch
;
340 if (starts_with(key
, "branch.")) {
342 subkey
= strrchr(name
, '.');
345 branch
= make_branch(name
, subkey
- name
);
346 if (!strcmp(subkey
, ".remote")) {
347 if (git_config_string(&branch
->remote_name
, key
, value
))
349 if (branch
== current_branch
) {
350 default_remote_name
= branch
->remote_name
;
351 explicit_default_remote_name
= 1;
353 } else if (!strcmp(subkey
, ".pushremote")) {
354 if (branch
== current_branch
)
355 if (git_config_string(&pushremote_name
, key
, value
))
357 } else if (!strcmp(subkey
, ".merge")) {
359 return config_error_nonbool(key
);
360 add_merge(branch
, xstrdup(value
));
364 if (starts_with(key
, "url.")) {
365 struct rewrite
*rewrite
;
367 subkey
= strrchr(name
, '.');
370 if (!strcmp(subkey
, ".insteadof")) {
371 rewrite
= make_rewrite(&rewrites
, name
, subkey
- name
);
373 return config_error_nonbool(key
);
374 add_instead_of(rewrite
, xstrdup(value
));
375 } else if (!strcmp(subkey
, ".pushinsteadof")) {
376 rewrite
= make_rewrite(&rewrites_push
, name
, subkey
- name
);
378 return config_error_nonbool(key
);
379 add_instead_of(rewrite
, xstrdup(value
));
383 if (!starts_with(key
, "remote."))
387 /* Handle remote.* variables */
388 if (!strcmp(name
, "pushdefault"))
389 return git_config_string(&pushremote_name
, key
, value
);
391 /* Handle remote.<name>.* variables */
393 warning("Config remote shorthand cannot begin with '/': %s",
397 subkey
= strrchr(name
, '.');
400 remote
= make_remote(name
, subkey
- name
);
401 remote
->origin
= REMOTE_CONFIG
;
402 if (!strcmp(subkey
, ".mirror"))
403 remote
->mirror
= git_config_bool(key
, value
);
404 else if (!strcmp(subkey
, ".skipdefaultupdate"))
405 remote
->skip_default_update
= git_config_bool(key
, value
);
406 else if (!strcmp(subkey
, ".skipfetchall"))
407 remote
->skip_default_update
= git_config_bool(key
, value
);
408 else if (!strcmp(subkey
, ".prune"))
409 remote
->prune
= git_config_bool(key
, value
);
410 else if (!strcmp(subkey
, ".url")) {
412 if (git_config_string(&v
, key
, value
))
415 } else if (!strcmp(subkey
, ".pushurl")) {
417 if (git_config_string(&v
, key
, value
))
419 add_pushurl(remote
, v
);
420 } else if (!strcmp(subkey
, ".push")) {
422 if (git_config_string(&v
, key
, value
))
424 add_push_refspec(remote
, v
);
425 } else if (!strcmp(subkey
, ".fetch")) {
427 if (git_config_string(&v
, key
, value
))
429 add_fetch_refspec(remote
, v
);
430 } else if (!strcmp(subkey
, ".receivepack")) {
432 if (git_config_string(&v
, key
, value
))
434 if (!remote
->receivepack
)
435 remote
->receivepack
= v
;
437 error("more than one receivepack given, using the first");
438 } else if (!strcmp(subkey
, ".uploadpack")) {
440 if (git_config_string(&v
, key
, value
))
442 if (!remote
->uploadpack
)
443 remote
->uploadpack
= v
;
445 error("more than one uploadpack given, using the first");
446 } else if (!strcmp(subkey
, ".tagopt")) {
447 if (!strcmp(value
, "--no-tags"))
448 remote
->fetch_tags
= -1;
449 else if (!strcmp(value
, "--tags"))
450 remote
->fetch_tags
= 2;
451 } else if (!strcmp(subkey
, ".proxy")) {
452 return git_config_string((const char **)&remote
->http_proxy
,
454 } else if (!strcmp(subkey
, ".vcs")) {
455 return git_config_string(&remote
->foreign_vcs
, key
, value
);
460 static void alias_all_urls(void)
463 for (i
= 0; i
< remotes_nr
; i
++) {
464 int add_pushurl_aliases
;
467 for (j
= 0; j
< remotes
[i
]->pushurl_nr
; j
++) {
468 remotes
[i
]->pushurl
[j
] = alias_url(remotes
[i
]->pushurl
[j
], &rewrites
);
470 add_pushurl_aliases
= remotes
[i
]->pushurl_nr
== 0;
471 for (j
= 0; j
< remotes
[i
]->url_nr
; j
++) {
472 if (add_pushurl_aliases
)
473 add_pushurl_alias(remotes
[i
], remotes
[i
]->url
[j
]);
474 remotes
[i
]->url
[j
] = alias_url(remotes
[i
]->url
[j
], &rewrites
);
479 static void read_config(void)
481 unsigned char sha1
[20];
482 const char *head_ref
;
484 if (default_remote_name
) /* did this already */
486 default_remote_name
= "origin";
487 current_branch
= NULL
;
488 head_ref
= resolve_ref_unsafe("HEAD", sha1
, 0, &flag
);
489 if (head_ref
&& (flag
& REF_ISSYMREF
) &&
490 starts_with(head_ref
, "refs/heads/")) {
492 make_branch(head_ref
+ strlen("refs/heads/"), 0);
494 git_config(handle_config
, NULL
);
499 * This function frees a refspec array.
500 * Warning: code paths should be checked to ensure that the src
501 * and dst pointers are always freeable pointers as well
502 * as the refspec pointer itself.
504 static void free_refspecs(struct refspec
*refspec
, int nr_refspec
)
511 for (i
= 0; i
< nr_refspec
; i
++) {
512 free(refspec
[i
].src
);
513 free(refspec
[i
].dst
);
518 static struct refspec
*parse_refspec_internal(int nr_refspec
, const char **refspec
, int fetch
, int verify
)
521 struct refspec
*rs
= xcalloc(sizeof(*rs
), nr_refspec
);
523 for (i
= 0; i
< nr_refspec
; i
++) {
526 const char *lhs
, *rhs
;
537 rhs
= strrchr(lhs
, ':');
540 * Before going on, special case ":" (or "+:") as a refspec
541 * for pushing matching refs.
543 if (!fetch
&& rhs
== lhs
&& rhs
[1] == '\0') {
549 size_t rlen
= strlen(++rhs
);
550 is_glob
= (1 <= rlen
&& strchr(rhs
, '*'));
551 rs
[i
].dst
= xstrndup(rhs
, rlen
);
554 llen
= (rhs
? (rhs
- lhs
- 1) : strlen(lhs
));
555 if (1 <= llen
&& memchr(lhs
, '*', llen
)) {
556 if ((rhs
&& !is_glob
) || (!rhs
&& fetch
))
559 } else if (rhs
&& is_glob
) {
563 rs
[i
].pattern
= is_glob
;
564 rs
[i
].src
= xstrndup(lhs
, llen
);
565 flags
= REFNAME_ALLOW_ONELEVEL
| (is_glob
? REFNAME_REFSPEC_PATTERN
: 0);
568 unsigned char unused
[40];
572 ; /* empty is ok; it means "HEAD" */
573 else if (llen
== 40 && !get_sha1_hex(rs
[i
].src
, unused
))
574 rs
[i
].exact_sha1
= 1; /* ok */
575 else if (!check_refname_format(rs
[i
].src
, flags
))
576 ; /* valid looking ref is ok */
581 ; /* missing is ok; it is the same as empty */
582 else if (!*rs
[i
].dst
)
583 ; /* empty is ok; it means "do not store" */
584 else if (!check_refname_format(rs
[i
].dst
, flags
))
585 ; /* valid looking ref is ok */
591 * - empty is allowed; it means delete.
592 * - when wildcarded, it must be a valid looking ref.
593 * - otherwise, it must be an extended SHA-1, but
594 * there is no existing way to validate this.
599 if (check_refname_format(rs
[i
].src
, flags
))
603 ; /* anything goes, for now */
606 * - missing is allowed, but LHS then must be a
608 * - empty is not allowed.
609 * - otherwise it must be a valid looking ref.
612 if (check_refname_format(rs
[i
].src
, flags
))
614 } else if (!*rs
[i
].dst
) {
617 if (check_refname_format(rs
[i
].dst
, flags
))
627 * nr_refspec must be greater than zero and i must be valid
628 * since it is only possible to reach this point from within
629 * the for loop above.
631 free_refspecs(rs
, i
+1);
634 die("Invalid refspec '%s'", refspec
[i
]);
637 int valid_fetch_refspec(const char *fetch_refspec_str
)
639 struct refspec
*refspec
;
641 refspec
= parse_refspec_internal(1, &fetch_refspec_str
, 1, 1);
642 free_refspecs(refspec
, 1);
646 struct refspec
*parse_fetch_refspec(int nr_refspec
, const char **refspec
)
648 return parse_refspec_internal(nr_refspec
, refspec
, 1, 0);
651 static struct refspec
*parse_push_refspec(int nr_refspec
, const char **refspec
)
653 return parse_refspec_internal(nr_refspec
, refspec
, 0, 0);
656 void free_refspec(int nr_refspec
, struct refspec
*refspec
)
659 for (i
= 0; i
< nr_refspec
; i
++) {
660 free(refspec
[i
].src
);
661 free(refspec
[i
].dst
);
666 static int valid_remote_nick(const char *name
)
668 if (!name
[0] || is_dot_or_dotdot(name
))
670 return !strchr(name
, '/'); /* no slash */
673 static struct remote
*remote_get_1(const char *name
, const char *pushremote_name
)
681 if (pushremote_name
) {
682 name
= pushremote_name
;
685 name
= default_remote_name
;
686 name_given
= explicit_default_remote_name
;
690 ret
= make_remote(name
, 0);
691 if (valid_remote_nick(name
)) {
692 if (!valid_remote(ret
))
693 read_remotes_file(ret
);
694 if (!valid_remote(ret
))
695 read_branches_file(ret
);
697 if (name_given
&& !valid_remote(ret
))
698 add_url_alias(ret
, name
);
699 if (!valid_remote(ret
))
701 ret
->fetch
= parse_fetch_refspec(ret
->fetch_refspec_nr
, ret
->fetch_refspec
);
702 ret
->push
= parse_push_refspec(ret
->push_refspec_nr
, ret
->push_refspec
);
706 struct remote
*remote_get(const char *name
)
709 return remote_get_1(name
, NULL
);
712 struct remote
*pushremote_get(const char *name
)
715 return remote_get_1(name
, pushremote_name
);
718 int remote_is_configured(const char *name
)
723 for (i
= 0; i
< remotes_nr
; i
++)
724 if (!strcmp(name
, remotes
[i
]->name
))
729 int for_each_remote(each_remote_fn fn
, void *priv
)
733 for (i
= 0; i
< remotes_nr
&& !result
; i
++) {
734 struct remote
*r
= remotes
[i
];
738 r
->fetch
= parse_fetch_refspec(r
->fetch_refspec_nr
,
741 r
->push
= parse_push_refspec(r
->push_refspec_nr
,
743 result
= fn(r
, priv
);
748 static void handle_duplicate(struct ref
*ref1
, struct ref
*ref2
)
750 if (strcmp(ref1
->name
, ref2
->name
)) {
751 if (ref1
->fetch_head_status
!= FETCH_HEAD_IGNORE
&&
752 ref2
->fetch_head_status
!= FETCH_HEAD_IGNORE
) {
753 die(_("Cannot fetch both %s and %s to %s"),
754 ref1
->name
, ref2
->name
, ref2
->peer_ref
->name
);
755 } else if (ref1
->fetch_head_status
!= FETCH_HEAD_IGNORE
&&
756 ref2
->fetch_head_status
== FETCH_HEAD_IGNORE
) {
757 warning(_("%s usually tracks %s, not %s"),
758 ref2
->peer_ref
->name
, ref2
->name
, ref1
->name
);
759 } else if (ref1
->fetch_head_status
== FETCH_HEAD_IGNORE
&&
760 ref2
->fetch_head_status
== FETCH_HEAD_IGNORE
) {
761 die(_("%s tracks both %s and %s"),
762 ref2
->peer_ref
->name
, ref1
->name
, ref2
->name
);
765 * This last possibility doesn't occur because
766 * FETCH_HEAD_IGNORE entries always appear at
767 * the end of the list.
769 die(_("Internal error"));
772 free(ref2
->peer_ref
);
776 struct ref
*ref_remove_duplicates(struct ref
*ref_map
)
778 struct string_list refs
= STRING_LIST_INIT_NODUP
;
779 struct ref
*retval
= NULL
;
780 struct ref
**p
= &retval
;
783 struct ref
*ref
= ref_map
;
785 ref_map
= ref_map
->next
;
788 if (!ref
->peer_ref
) {
792 struct string_list_item
*item
=
793 string_list_insert(&refs
, ref
->peer_ref
->name
);
796 /* Entry already existed */
797 handle_duplicate((struct ref
*)item
->util
, ref
);
806 string_list_clear(&refs
, 0);
810 int remote_has_url(struct remote
*remote
, const char *url
)
813 for (i
= 0; i
< remote
->url_nr
; i
++) {
814 if (!strcmp(remote
->url
[i
], url
))
820 static int match_name_with_pattern(const char *key
, const char *name
,
821 const char *value
, char **result
)
823 const char *kstar
= strchr(key
, '*');
829 die("Key '%s' of pattern had no '*'", key
);
831 ksuffixlen
= strlen(kstar
+ 1);
832 namelen
= strlen(name
);
833 ret
= !strncmp(name
, key
, klen
) && namelen
>= klen
+ ksuffixlen
&&
834 !memcmp(name
+ namelen
- ksuffixlen
, kstar
+ 1, ksuffixlen
);
836 const char *vstar
= strchr(value
, '*');
840 die("Value '%s' of pattern has no '*'", value
);
841 vlen
= vstar
- value
;
842 vsuffixlen
= strlen(vstar
+ 1);
843 *result
= xmalloc(vlen
+ vsuffixlen
+
845 klen
- ksuffixlen
+ 1);
846 strncpy(*result
, value
, vlen
);
847 strncpy(*result
+ vlen
,
848 name
+ klen
, namelen
- klen
- ksuffixlen
);
849 strcpy(*result
+ vlen
+ namelen
- klen
- ksuffixlen
,
855 int query_refspecs(struct refspec
*refs
, int ref_count
, struct refspec
*query
)
858 int find_src
= !query
->src
;
859 const char *needle
= find_src
? query
->dst
: query
->src
;
860 char **result
= find_src
? &query
->src
: &query
->dst
;
862 if (find_src
&& !query
->dst
)
863 return error("query_refspecs: need either src or dst");
865 for (i
= 0; i
< ref_count
; i
++) {
866 struct refspec
*refspec
= &refs
[i
];
867 const char *key
= find_src
? refspec
->dst
: refspec
->src
;
868 const char *value
= find_src
? refspec
->src
: refspec
->dst
;
872 if (refspec
->pattern
) {
873 if (match_name_with_pattern(key
, needle
, value
, result
)) {
874 query
->force
= refspec
->force
;
877 } else if (!strcmp(needle
, key
)) {
878 *result
= xstrdup(value
);
879 query
->force
= refspec
->force
;
886 char *apply_refspecs(struct refspec
*refspecs
, int nr_refspec
,
889 struct refspec query
;
891 memset(&query
, 0, sizeof(struct refspec
));
892 query
.src
= (char *)name
;
894 if (query_refspecs(refspecs
, nr_refspec
, &query
))
900 int remote_find_tracking(struct remote
*remote
, struct refspec
*refspec
)
902 return query_refspecs(remote
->fetch
, remote
->fetch_refspec_nr
, refspec
);
905 static struct ref
*alloc_ref_with_prefix(const char *prefix
, size_t prefixlen
,
908 size_t len
= strlen(name
);
909 struct ref
*ref
= xcalloc(1, sizeof(struct ref
) + prefixlen
+ len
+ 1);
910 memcpy(ref
->name
, prefix
, prefixlen
);
911 memcpy(ref
->name
+ prefixlen
, name
, len
);
915 struct ref
*alloc_ref(const char *name
)
917 return alloc_ref_with_prefix("", 0, name
);
920 struct ref
*copy_ref(const struct ref
*ref
)
926 len
= strlen(ref
->name
);
927 cpy
= xmalloc(sizeof(struct ref
) + len
+ 1);
928 memcpy(cpy
, ref
, sizeof(struct ref
) + len
+ 1);
930 cpy
->symref
= ref
->symref
? xstrdup(ref
->symref
) : NULL
;
931 cpy
->remote_status
= ref
->remote_status
? xstrdup(ref
->remote_status
) : NULL
;
932 cpy
->peer_ref
= copy_ref(ref
->peer_ref
);
936 struct ref
*copy_ref_list(const struct ref
*ref
)
938 struct ref
*ret
= NULL
;
939 struct ref
**tail
= &ret
;
941 *tail
= copy_ref(ref
);
943 tail
= &((*tail
)->next
);
948 static void free_ref(struct ref
*ref
)
952 free_ref(ref
->peer_ref
);
953 free(ref
->remote_status
);
958 void free_refs(struct ref
*ref
)
968 int ref_compare_name(const void *va
, const void *vb
)
970 const struct ref
*a
= va
, *b
= vb
;
971 return strcmp(a
->name
, b
->name
);
974 static void *ref_list_get_next(const void *a
)
976 return ((const struct ref
*)a
)->next
;
979 static void ref_list_set_next(void *a
, void *next
)
981 ((struct ref
*)a
)->next
= next
;
984 void sort_ref_list(struct ref
**l
, int (*cmp
)(const void *, const void *))
986 *l
= llist_mergesort(*l
, ref_list_get_next
, ref_list_set_next
, cmp
);
989 int count_refspec_match(const char *pattern
,
991 struct ref
**matched_ref
)
993 int patlen
= strlen(pattern
);
994 struct ref
*matched_weak
= NULL
;
995 struct ref
*matched
= NULL
;
999 for (weak_match
= match
= 0; refs
; refs
= refs
->next
) {
1000 char *name
= refs
->name
;
1001 int namelen
= strlen(name
);
1003 if (!refname_match(pattern
, name
))
1006 /* A match is "weak" if it is with refs outside
1007 * heads or tags, and did not specify the pattern
1008 * in full (e.g. "refs/remotes/origin/master") or at
1009 * least from the toplevel (e.g. "remotes/origin/master");
1010 * otherwise "git push $URL master" would result in
1011 * ambiguity between remotes/origin/master and heads/master
1012 * at the remote site.
1014 if (namelen
!= patlen
&&
1015 patlen
!= namelen
- 5 &&
1016 !starts_with(name
, "refs/heads/") &&
1017 !starts_with(name
, "refs/tags/")) {
1018 /* We want to catch the case where only weak
1019 * matches are found and there are multiple
1020 * matches, and where more than one strong
1021 * matches are found, as ambiguous. One
1022 * strong match with zero or more weak matches
1023 * are acceptable as a unique match.
1025 matched_weak
= refs
;
1034 *matched_ref
= matched_weak
;
1038 *matched_ref
= matched
;
1043 static void tail_link_ref(struct ref
*ref
, struct ref
***tail
)
1051 static struct ref
*alloc_delete_ref(void)
1053 struct ref
*ref
= alloc_ref("(delete)");
1054 hashclr(ref
->new_sha1
);
1058 static struct ref
*try_explicit_object_name(const char *name
)
1060 unsigned char sha1
[20];
1064 return alloc_delete_ref();
1065 if (get_sha1(name
, sha1
))
1067 ref
= alloc_ref(name
);
1068 hashcpy(ref
->new_sha1
, sha1
);
1072 static struct ref
*make_linked_ref(const char *name
, struct ref
***tail
)
1074 struct ref
*ret
= alloc_ref(name
);
1075 tail_link_ref(ret
, tail
);
1079 static char *guess_ref(const char *name
, struct ref
*peer
)
1081 struct strbuf buf
= STRBUF_INIT
;
1082 unsigned char sha1
[20];
1084 const char *r
= resolve_ref_unsafe(peer
->name
, sha1
, 1, NULL
);
1088 if (starts_with(r
, "refs/heads/"))
1089 strbuf_addstr(&buf
, "refs/heads/");
1090 else if (starts_with(r
, "refs/tags/"))
1091 strbuf_addstr(&buf
, "refs/tags/");
1095 strbuf_addstr(&buf
, name
);
1096 return strbuf_detach(&buf
, NULL
);
1099 static int match_explicit_lhs(struct ref
*src
,
1102 int *allocated_match
)
1104 switch (count_refspec_match(rs
->src
, src
, match
)) {
1106 *allocated_match
= 0;
1109 /* The source could be in the get_sha1() format
1110 * not a reference name. :refs/other is a
1111 * way to delete 'other' ref at the remote end.
1113 *match
= try_explicit_object_name(rs
->src
);
1115 return error("src refspec %s does not match any.", rs
->src
);
1116 *allocated_match
= 1;
1119 return error("src refspec %s matches more than one.", rs
->src
);
1123 static int match_explicit(struct ref
*src
, struct ref
*dst
,
1124 struct ref
***dst_tail
,
1127 struct ref
*matched_src
, *matched_dst
;
1130 const char *dst_value
= rs
->dst
;
1133 if (rs
->pattern
|| rs
->matching
)
1136 matched_src
= matched_dst
= NULL
;
1137 if (match_explicit_lhs(src
, rs
, &matched_src
, &allocated_src
) < 0)
1141 unsigned char sha1
[20];
1144 dst_value
= resolve_ref_unsafe(matched_src
->name
, sha1
, 1, &flag
);
1146 ((flag
& REF_ISSYMREF
) &&
1147 !starts_with(dst_value
, "refs/heads/")))
1148 die("%s cannot be resolved to branch.",
1152 switch (count_refspec_match(dst_value
, dst
, &matched_dst
)) {
1156 if (!memcmp(dst_value
, "refs/", 5))
1157 matched_dst
= make_linked_ref(dst_value
, dst_tail
);
1158 else if (is_null_sha1(matched_src
->new_sha1
))
1159 error("unable to delete '%s': remote ref does not exist",
1161 else if ((dst_guess
= guess_ref(dst_value
, matched_src
)))
1162 matched_dst
= make_linked_ref(dst_guess
, dst_tail
);
1164 error("unable to push to unqualified destination: %s\n"
1165 "The destination refspec neither matches an "
1166 "existing ref on the remote nor\n"
1167 "begins with refs/, and we are unable to "
1168 "guess a prefix based on the source ref.",
1173 error("dst refspec %s matches more than one.",
1179 if (matched_dst
->peer_ref
)
1180 return error("dst ref %s receives from more than one src.",
1183 matched_dst
->peer_ref
= allocated_src
?
1185 copy_ref(matched_src
);
1186 matched_dst
->force
= rs
->force
;
1191 static int match_explicit_refs(struct ref
*src
, struct ref
*dst
,
1192 struct ref
***dst_tail
, struct refspec
*rs
,
1196 for (i
= errs
= 0; i
< rs_nr
; i
++)
1197 errs
+= match_explicit(src
, dst
, dst_tail
, &rs
[i
]);
1201 static char *get_ref_match(const struct refspec
*rs
, int rs_nr
, const struct ref
*ref
,
1202 int send_mirror
, int direction
, const struct refspec
**ret_pat
)
1204 const struct refspec
*pat
;
1207 int matching_refs
= -1;
1208 for (i
= 0; i
< rs_nr
; i
++) {
1209 if (rs
[i
].matching
&&
1210 (matching_refs
== -1 || rs
[i
].force
)) {
1215 if (rs
[i
].pattern
) {
1216 const char *dst_side
= rs
[i
].dst
? rs
[i
].dst
: rs
[i
].src
;
1218 if (direction
== FROM_SRC
)
1219 match
= match_name_with_pattern(rs
[i
].src
, ref
->name
, dst_side
, &name
);
1221 match
= match_name_with_pattern(dst_side
, ref
->name
, rs
[i
].src
, &name
);
1228 if (matching_refs
== -1)
1231 pat
= rs
+ matching_refs
;
1232 if (pat
->matching
) {
1234 * "matching refs"; traditionally we pushed everything
1235 * including refs outside refs/heads/ hierarchy, but
1236 * that does not make much sense these days.
1238 if (!send_mirror
&& !starts_with(ref
->name
, "refs/heads/"))
1240 name
= xstrdup(ref
->name
);
1247 static struct ref
**tail_ref(struct ref
**head
)
1249 struct ref
**tail
= head
;
1251 tail
= &((*tail
)->next
);
1256 struct commit
**tip
;
1260 static void add_to_tips(struct tips
*tips
, const unsigned char *sha1
)
1262 struct commit
*commit
;
1264 if (is_null_sha1(sha1
))
1266 commit
= lookup_commit_reference_gently(sha1
, 1);
1267 if (!commit
|| (commit
->object
.flags
& TMP_MARK
))
1269 commit
->object
.flags
|= TMP_MARK
;
1270 ALLOC_GROW(tips
->tip
, tips
->nr
+ 1, tips
->alloc
);
1271 tips
->tip
[tips
->nr
++] = commit
;
1274 static void add_missing_tags(struct ref
*src
, struct ref
**dst
, struct ref
***dst_tail
)
1276 struct string_list dst_tag
= STRING_LIST_INIT_NODUP
;
1277 struct string_list src_tag
= STRING_LIST_INIT_NODUP
;
1278 struct string_list_item
*item
;
1280 struct tips sent_tips
;
1283 * Collect everything we know they would have at the end of
1284 * this push, and collect all tags they have.
1286 memset(&sent_tips
, 0, sizeof(sent_tips
));
1287 for (ref
= *dst
; ref
; ref
= ref
->next
) {
1288 if (ref
->peer_ref
&&
1289 !is_null_sha1(ref
->peer_ref
->new_sha1
))
1290 add_to_tips(&sent_tips
, ref
->peer_ref
->new_sha1
);
1292 add_to_tips(&sent_tips
, ref
->old_sha1
);
1293 if (starts_with(ref
->name
, "refs/tags/"))
1294 string_list_append(&dst_tag
, ref
->name
);
1296 clear_commit_marks_many(sent_tips
.nr
, sent_tips
.tip
, TMP_MARK
);
1298 sort_string_list(&dst_tag
);
1300 /* Collect tags they do not have. */
1301 for (ref
= src
; ref
; ref
= ref
->next
) {
1302 if (!starts_with(ref
->name
, "refs/tags/"))
1303 continue; /* not a tag */
1304 if (string_list_has_string(&dst_tag
, ref
->name
))
1305 continue; /* they already have it */
1306 if (sha1_object_info(ref
->new_sha1
, NULL
) != OBJ_TAG
)
1307 continue; /* be conservative */
1308 item
= string_list_append(&src_tag
, ref
->name
);
1311 string_list_clear(&dst_tag
, 0);
1314 * At this point, src_tag lists tags that are missing from
1315 * dst, and sent_tips lists the tips we are pushing or those
1316 * that we know they already have. An element in the src_tag
1317 * that is an ancestor of any of the sent_tips needs to be
1318 * sent to the other side.
1321 for_each_string_list_item(item
, &src_tag
) {
1322 struct ref
*ref
= item
->util
;
1323 struct ref
*dst_ref
;
1324 struct commit
*commit
;
1326 if (is_null_sha1(ref
->new_sha1
))
1328 commit
= lookup_commit_reference_gently(ref
->new_sha1
, 1);
1330 /* not pushing a commit, which is not an error */
1334 * Is this tag, which they do not have, reachable from
1335 * any of the commits we are sending?
1337 if (!in_merge_bases_many(commit
, sent_tips
.nr
, sent_tips
.tip
))
1341 dst_ref
= make_linked_ref(ref
->name
, dst_tail
);
1342 hashcpy(dst_ref
->new_sha1
, ref
->new_sha1
);
1343 dst_ref
->peer_ref
= copy_ref(ref
);
1346 string_list_clear(&src_tag
, 0);
1347 free(sent_tips
.tip
);
1350 struct ref
*find_ref_by_name(const struct ref
*list
, const char *name
)
1352 for ( ; list
; list
= list
->next
)
1353 if (!strcmp(list
->name
, name
))
1354 return (struct ref
*)list
;
1358 static void prepare_ref_index(struct string_list
*ref_index
, struct ref
*ref
)
1360 for ( ; ref
; ref
= ref
->next
)
1361 string_list_append_nodup(ref_index
, ref
->name
)->util
= ref
;
1363 sort_string_list(ref_index
);
1367 * Given the set of refs the local repository has, the set of refs the
1368 * remote repository has, and the refspec used for push, determine
1369 * what remote refs we will update and with what value by setting
1370 * peer_ref (which object is being pushed) and force (if the push is
1371 * forced) in elements of "dst". The function may add new elements to
1372 * dst (e.g. pushing to a new branch, done in match_explicit_refs).
1374 int match_push_refs(struct ref
*src
, struct ref
**dst
,
1375 int nr_refspec
, const char **refspec
, int flags
)
1378 int send_all
= flags
& MATCH_REFS_ALL
;
1379 int send_mirror
= flags
& MATCH_REFS_MIRROR
;
1380 int send_prune
= flags
& MATCH_REFS_PRUNE
;
1382 static const char *default_refspec
[] = { ":", NULL
};
1383 struct ref
*ref
, **dst_tail
= tail_ref(dst
);
1384 struct string_list dst_ref_index
= STRING_LIST_INIT_NODUP
;
1388 refspec
= default_refspec
;
1390 rs
= parse_push_refspec(nr_refspec
, (const char **) refspec
);
1391 errs
= match_explicit_refs(src
, *dst
, &dst_tail
, rs
, nr_refspec
);
1393 /* pick the remainder */
1394 for (ref
= src
; ref
; ref
= ref
->next
) {
1395 struct string_list_item
*dst_item
;
1396 struct ref
*dst_peer
;
1397 const struct refspec
*pat
= NULL
;
1400 dst_name
= get_ref_match(rs
, nr_refspec
, ref
, send_mirror
, FROM_SRC
, &pat
);
1404 if (!dst_ref_index
.nr
)
1405 prepare_ref_index(&dst_ref_index
, *dst
);
1407 dst_item
= string_list_lookup(&dst_ref_index
, dst_name
);
1408 dst_peer
= dst_item
? dst_item
->util
: NULL
;
1410 if (dst_peer
->peer_ref
)
1411 /* We're already sending something to this ref. */
1414 if (pat
->matching
&& !(send_all
|| send_mirror
))
1416 * Remote doesn't have it, and we have no
1417 * explicit pattern, and we don't have
1418 * --all nor --mirror.
1422 /* Create a new one and link it */
1423 dst_peer
= make_linked_ref(dst_name
, &dst_tail
);
1424 hashcpy(dst_peer
->new_sha1
, ref
->new_sha1
);
1425 string_list_insert(&dst_ref_index
,
1426 dst_peer
->name
)->util
= dst_peer
;
1428 dst_peer
->peer_ref
= copy_ref(ref
);
1429 dst_peer
->force
= pat
->force
;
1434 string_list_clear(&dst_ref_index
, 0);
1436 if (flags
& MATCH_REFS_FOLLOW_TAGS
)
1437 add_missing_tags(src
, dst
, &dst_tail
);
1440 struct string_list src_ref_index
= STRING_LIST_INIT_NODUP
;
1441 /* check for missing refs on the remote */
1442 for (ref
= *dst
; ref
; ref
= ref
->next
) {
1446 /* We're already sending something to this ref. */
1449 src_name
= get_ref_match(rs
, nr_refspec
, ref
, send_mirror
, FROM_DST
, NULL
);
1451 if (!src_ref_index
.nr
)
1452 prepare_ref_index(&src_ref_index
, src
);
1453 if (!string_list_has_string(&src_ref_index
,
1455 ref
->peer_ref
= alloc_delete_ref();
1459 string_list_clear(&src_ref_index
, 0);
1466 void set_ref_status_for_push(struct ref
*remote_refs
, int send_mirror
,
1471 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
1472 int force_ref_update
= ref
->force
|| force_update
;
1473 int reject_reason
= 0;
1476 hashcpy(ref
->new_sha1
, ref
->peer_ref
->new_sha1
);
1477 else if (!send_mirror
)
1480 ref
->deletion
= is_null_sha1(ref
->new_sha1
);
1481 if (!ref
->deletion
&&
1482 !hashcmp(ref
->old_sha1
, ref
->new_sha1
)) {
1483 ref
->status
= REF_STATUS_UPTODATE
;
1488 * Bypass the usual "must fast-forward" check but
1489 * replace it with a weaker "the old value must be
1490 * this value we observed". If the remote ref has
1491 * moved and is now different from what we expect,
1494 * It also is an error if the user told us to check
1495 * with the remote-tracking branch to find the value
1496 * to expect, but we did not have such a tracking
1499 if (ref
->expect_old_sha1
) {
1500 if (ref
->expect_old_no_trackback
||
1501 hashcmp(ref
->old_sha1
, ref
->old_sha1_expect
))
1502 reject_reason
= REF_STATUS_REJECT_STALE
;
1506 * The usual "must fast-forward" rules.
1508 * Decide whether an individual refspec A:B can be
1509 * pushed. The push will succeed if any of the
1510 * following are true:
1512 * (1) the remote reference B does not exist
1514 * (2) the remote reference B is being removed (i.e.,
1515 * pushing :B where no source is specified)
1517 * (3) the destination is not under refs/tags/, and
1518 * if the old and new value is a commit, the new
1519 * is a descendant of the old.
1521 * (4) it is forced using the +A:B notation, or by
1522 * passing the --force argument
1525 else if (!ref
->deletion
&& !is_null_sha1(ref
->old_sha1
)) {
1526 if (starts_with(ref
->name
, "refs/tags/"))
1527 reject_reason
= REF_STATUS_REJECT_ALREADY_EXISTS
;
1528 else if (!has_sha1_file(ref
->old_sha1
))
1529 reject_reason
= REF_STATUS_REJECT_FETCH_FIRST
;
1530 else if (!lookup_commit_reference_gently(ref
->old_sha1
, 1) ||
1531 !lookup_commit_reference_gently(ref
->new_sha1
, 1))
1532 reject_reason
= REF_STATUS_REJECT_NEEDS_FORCE
;
1533 else if (!ref_newer(ref
->new_sha1
, ref
->old_sha1
))
1534 reject_reason
= REF_STATUS_REJECT_NONFASTFORWARD
;
1538 * "--force" will defeat any rejection implemented
1539 * by the rules above.
1541 if (!force_ref_update
)
1542 ref
->status
= reject_reason
;
1543 else if (reject_reason
)
1544 ref
->forced_update
= 1;
1548 struct branch
*branch_get(const char *name
)
1553 if (!name
|| !*name
|| !strcmp(name
, "HEAD"))
1554 ret
= current_branch
;
1556 ret
= make_branch(name
, 0);
1557 if (ret
&& ret
->remote_name
) {
1558 ret
->remote
= remote_get(ret
->remote_name
);
1559 if (ret
->merge_nr
) {
1561 ret
->merge
= xcalloc(ret
->merge_nr
, sizeof(*ret
->merge
));
1562 for (i
= 0; i
< ret
->merge_nr
; i
++) {
1563 ret
->merge
[i
] = xcalloc(1, sizeof(**ret
->merge
));
1564 ret
->merge
[i
]->src
= xstrdup(ret
->merge_name
[i
]);
1565 if (remote_find_tracking(ret
->remote
, ret
->merge
[i
])
1566 && !strcmp(ret
->remote_name
, "."))
1567 ret
->merge
[i
]->dst
= xstrdup(ret
->merge_name
[i
]);
1574 int branch_has_merge_config(struct branch
*branch
)
1576 return branch
&& !!branch
->merge
;
1579 int branch_merge_matches(struct branch
*branch
,
1581 const char *refname
)
1583 if (!branch
|| i
< 0 || i
>= branch
->merge_nr
)
1585 return refname_match(branch
->merge
[i
]->src
, refname
);
1588 static int ignore_symref_update(const char *refname
)
1590 unsigned char sha1
[20];
1593 if (!resolve_ref_unsafe(refname
, sha1
, 0, &flag
))
1594 return 0; /* non-existing refs are OK */
1595 return (flag
& REF_ISSYMREF
);
1599 * Create and return a list of (struct ref) consisting of copies of
1600 * each remote_ref that matches refspec. refspec must be a pattern.
1601 * Fill in the copies' peer_ref to describe the local tracking refs to
1602 * which they map. Omit any references that would map to an existing
1603 * local symbolic ref.
1605 static struct ref
*get_expanded_map(const struct ref
*remote_refs
,
1606 const struct refspec
*refspec
)
1608 const struct ref
*ref
;
1609 struct ref
*ret
= NULL
;
1610 struct ref
**tail
= &ret
;
1612 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
1613 char *expn_name
= NULL
;
1615 if (strchr(ref
->name
, '^'))
1616 continue; /* a dereference item */
1617 if (match_name_with_pattern(refspec
->src
, ref
->name
,
1618 refspec
->dst
, &expn_name
) &&
1619 !ignore_symref_update(expn_name
)) {
1620 struct ref
*cpy
= copy_ref(ref
);
1622 cpy
->peer_ref
= alloc_ref(expn_name
);
1624 cpy
->peer_ref
->force
= 1;
1634 static const struct ref
*find_ref_by_name_abbrev(const struct ref
*refs
, const char *name
)
1636 const struct ref
*ref
;
1637 for (ref
= refs
; ref
; ref
= ref
->next
) {
1638 if (refname_match(name
, ref
->name
))
1644 struct ref
*get_remote_ref(const struct ref
*remote_refs
, const char *name
)
1646 const struct ref
*ref
= find_ref_by_name_abbrev(remote_refs
, name
);
1651 return copy_ref(ref
);
1654 static struct ref
*get_local_ref(const char *name
)
1656 if (!name
|| name
[0] == '\0')
1659 if (starts_with(name
, "refs/"))
1660 return alloc_ref(name
);
1662 if (starts_with(name
, "heads/") ||
1663 starts_with(name
, "tags/") ||
1664 starts_with(name
, "remotes/"))
1665 return alloc_ref_with_prefix("refs/", 5, name
);
1667 return alloc_ref_with_prefix("refs/heads/", 11, name
);
1670 int get_fetch_map(const struct ref
*remote_refs
,
1671 const struct refspec
*refspec
,
1675 struct ref
*ref_map
, **rmp
;
1677 if (refspec
->pattern
) {
1678 ref_map
= get_expanded_map(remote_refs
, refspec
);
1680 const char *name
= refspec
->src
[0] ? refspec
->src
: "HEAD";
1682 if (refspec
->exact_sha1
) {
1683 ref_map
= alloc_ref(name
);
1684 get_sha1_hex(name
, ref_map
->old_sha1
);
1686 ref_map
= get_remote_ref(remote_refs
, name
);
1688 if (!missing_ok
&& !ref_map
)
1689 die("Couldn't find remote ref %s", name
);
1691 ref_map
->peer_ref
= get_local_ref(refspec
->dst
);
1692 if (ref_map
->peer_ref
&& refspec
->force
)
1693 ref_map
->peer_ref
->force
= 1;
1697 for (rmp
= &ref_map
; *rmp
; ) {
1698 if ((*rmp
)->peer_ref
) {
1699 if (!starts_with((*rmp
)->peer_ref
->name
, "refs/") ||
1700 check_refname_format((*rmp
)->peer_ref
->name
, 0)) {
1701 struct ref
*ignore
= *rmp
;
1702 error("* Ignoring funny ref '%s' locally",
1703 (*rmp
)->peer_ref
->name
);
1704 *rmp
= (*rmp
)->next
;
1705 free(ignore
->peer_ref
);
1710 rmp
= &((*rmp
)->next
);
1714 tail_link_ref(ref_map
, tail
);
1719 int resolve_remote_symref(struct ref
*ref
, struct ref
*list
)
1723 for (; list
; list
= list
->next
)
1724 if (!strcmp(ref
->symref
, list
->name
)) {
1725 hashcpy(ref
->old_sha1
, list
->old_sha1
);
1731 static void unmark_and_free(struct commit_list
*list
, unsigned int mark
)
1734 struct commit_list
*temp
= list
;
1735 temp
->item
->object
.flags
&= ~mark
;
1741 int ref_newer(const unsigned char *new_sha1
, const unsigned char *old_sha1
)
1744 struct commit
*old
, *new;
1745 struct commit_list
*list
, *used
;
1749 * Both new and old must be commit-ish and new is descendant of
1750 * old. Otherwise we require --force.
1752 o
= deref_tag(parse_object(old_sha1
), NULL
, 0);
1753 if (!o
|| o
->type
!= OBJ_COMMIT
)
1755 old
= (struct commit
*) o
;
1757 o
= deref_tag(parse_object(new_sha1
), NULL
, 0);
1758 if (!o
|| o
->type
!= OBJ_COMMIT
)
1760 new = (struct commit
*) o
;
1762 if (parse_commit(new) < 0)
1766 commit_list_insert(new, &list
);
1768 new = pop_most_recent_commit(&list
, TMP_MARK
);
1769 commit_list_insert(new, &used
);
1775 unmark_and_free(list
, TMP_MARK
);
1776 unmark_and_free(used
, TMP_MARK
);
1781 * Compare a branch with its upstream, and save their differences (number
1782 * of commits) in *num_ours and *num_theirs.
1784 * Return 0 if branch has no upstream (no base), -1 if upstream is missing
1785 * (with "gone" base), otherwise 1 (with base).
1787 int stat_tracking_info(struct branch
*branch
, int *num_ours
, int *num_theirs
)
1789 unsigned char sha1
[20];
1790 struct commit
*ours
, *theirs
;
1792 struct rev_info revs
;
1793 const char *rev_argv
[10], *base
;
1796 /* Cannot stat unless we are marked to build on top of somebody else. */
1798 !branch
->merge
|| !branch
->merge
[0] || !branch
->merge
[0]->dst
)
1801 /* Cannot stat if what we used to build on no longer exists */
1802 base
= branch
->merge
[0]->dst
;
1803 if (read_ref(base
, sha1
))
1805 theirs
= lookup_commit_reference(sha1
);
1809 if (read_ref(branch
->refname
, sha1
))
1811 ours
= lookup_commit_reference(sha1
);
1815 /* are we the same? */
1816 if (theirs
== ours
) {
1817 *num_theirs
= *num_ours
= 0;
1821 /* Run "rev-list --left-right ours...theirs" internally... */
1823 rev_argv
[rev_argc
++] = NULL
;
1824 rev_argv
[rev_argc
++] = "--left-right";
1825 rev_argv
[rev_argc
++] = symmetric
;
1826 rev_argv
[rev_argc
++] = "--";
1827 rev_argv
[rev_argc
] = NULL
;
1829 strcpy(symmetric
, sha1_to_hex(ours
->object
.sha1
));
1830 strcpy(symmetric
+ 40, "...");
1831 strcpy(symmetric
+ 43, sha1_to_hex(theirs
->object
.sha1
));
1833 init_revisions(&revs
, NULL
);
1834 setup_revisions(rev_argc
, rev_argv
, &revs
, NULL
);
1835 prepare_revision_walk(&revs
);
1837 /* ... and count the commits on each side. */
1841 struct commit
*c
= get_revision(&revs
);
1844 if (c
->object
.flags
& SYMMETRIC_LEFT
)
1850 /* clear object flags smudged by the above traversal */
1851 clear_commit_marks(ours
, ALL_REV_FLAGS
);
1852 clear_commit_marks(theirs
, ALL_REV_FLAGS
);
1857 * Return true when there is anything to report, otherwise false.
1859 int format_tracking_info(struct branch
*branch
, struct strbuf
*sb
)
1863 int upstream_is_gone
= 0;
1865 switch (stat_tracking_info(branch
, &ours
, &theirs
)) {
1870 /* with "gone" base */
1871 upstream_is_gone
= 1;
1878 base
= branch
->merge
[0]->dst
;
1879 base
= shorten_unambiguous_ref(base
, 0);
1880 if (upstream_is_gone
) {
1882 _("Your branch is based on '%s', but the upstream is gone.\n"),
1884 if (advice_status_hints
)
1886 _(" (use \"git branch --unset-upstream\" to fixup)\n"));
1887 } else if (!ours
&& !theirs
) {
1889 _("Your branch is up-to-date with '%s'.\n"),
1891 } else if (!theirs
) {
1893 Q_("Your branch is ahead of '%s' by %d commit.\n",
1894 "Your branch is ahead of '%s' by %d commits.\n",
1897 if (advice_status_hints
)
1899 _(" (use \"git push\" to publish your local commits)\n"));
1902 Q_("Your branch is behind '%s' by %d commit, "
1903 "and can be fast-forwarded.\n",
1904 "Your branch is behind '%s' by %d commits, "
1905 "and can be fast-forwarded.\n",
1908 if (advice_status_hints
)
1910 _(" (use \"git pull\" to update your local branch)\n"));
1913 Q_("Your branch and '%s' have diverged,\n"
1914 "and have %d and %d different commit each, "
1916 "Your branch and '%s' have diverged,\n"
1917 "and have %d and %d different commits each, "
1920 base
, ours
, theirs
);
1921 if (advice_status_hints
)
1923 _(" (use \"git pull\" to merge the remote branch into yours)\n"));
1928 static int one_local_ref(const char *refname
, const unsigned char *sha1
, int flag
, void *cb_data
)
1930 struct ref
***local_tail
= cb_data
;
1934 /* we already know it starts with refs/ to get here */
1935 if (check_refname_format(refname
+ 5, 0))
1938 len
= strlen(refname
) + 1;
1939 ref
= xcalloc(1, sizeof(*ref
) + len
);
1940 hashcpy(ref
->new_sha1
, sha1
);
1941 memcpy(ref
->name
, refname
, len
);
1943 *local_tail
= &ref
->next
;
1947 struct ref
*get_local_heads(void)
1949 struct ref
*local_refs
= NULL
, **local_tail
= &local_refs
;
1950 for_each_ref(one_local_ref
, &local_tail
);
1954 struct ref
*guess_remote_head(const struct ref
*head
,
1955 const struct ref
*refs
,
1958 const struct ref
*r
;
1959 struct ref
*list
= NULL
;
1960 struct ref
**tail
= &list
;
1966 * Some transports support directly peeking at
1967 * where HEAD points; if that is the case, then
1968 * we don't have to guess.
1971 return copy_ref(find_ref_by_name(refs
, head
->symref
));
1973 /* If refs/heads/master could be right, it is. */
1975 r
= find_ref_by_name(refs
, "refs/heads/master");
1976 if (r
&& !hashcmp(r
->old_sha1
, head
->old_sha1
))
1980 /* Look for another ref that points there */
1981 for (r
= refs
; r
; r
= r
->next
) {
1983 starts_with(r
->name
, "refs/heads/") &&
1984 !hashcmp(r
->old_sha1
, head
->old_sha1
)) {
1985 *tail
= copy_ref(r
);
1986 tail
= &((*tail
)->next
);
1995 struct stale_heads_info
{
1996 struct string_list
*ref_names
;
1997 struct ref
**stale_refs_tail
;
1998 struct refspec
*refs
;
2002 static int get_stale_heads_cb(const char *refname
,
2003 const unsigned char *sha1
, int flags
, void *cb_data
)
2005 struct stale_heads_info
*info
= cb_data
;
2006 struct refspec query
;
2007 memset(&query
, 0, sizeof(struct refspec
));
2008 query
.dst
= (char *)refname
;
2010 if (query_refspecs(info
->refs
, info
->ref_count
, &query
))
2011 return 0; /* No matches */
2014 * If we did find a suitable refspec and it's not a symref and
2015 * it's not in the list of refs that currently exist in that
2016 * remote we consider it to be stale.
2018 if (!((flags
& REF_ISSYMREF
) ||
2019 string_list_has_string(info
->ref_names
, query
.src
))) {
2020 struct ref
*ref
= make_linked_ref(refname
, &info
->stale_refs_tail
);
2021 hashcpy(ref
->new_sha1
, sha1
);
2028 struct ref
*get_stale_heads(struct refspec
*refs
, int ref_count
, struct ref
*fetch_map
)
2030 struct ref
*ref
, *stale_refs
= NULL
;
2031 struct string_list ref_names
= STRING_LIST_INIT_NODUP
;
2032 struct stale_heads_info info
;
2033 info
.ref_names
= &ref_names
;
2034 info
.stale_refs_tail
= &stale_refs
;
2036 info
.ref_count
= ref_count
;
2037 for (ref
= fetch_map
; ref
; ref
= ref
->next
)
2038 string_list_append(&ref_names
, ref
->name
);
2039 sort_string_list(&ref_names
);
2040 for_each_ref(get_stale_heads_cb
, &info
);
2041 string_list_clear(&ref_names
, 0);
2048 void clear_cas_option(struct push_cas_option
*cas
)
2052 for (i
= 0; i
< cas
->nr
; i
++)
2053 free(cas
->entry
[i
].refname
);
2055 memset(cas
, 0, sizeof(*cas
));
2058 static struct push_cas
*add_cas_entry(struct push_cas_option
*cas
,
2059 const char *refname
,
2062 struct push_cas
*entry
;
2063 ALLOC_GROW(cas
->entry
, cas
->nr
+ 1, cas
->alloc
);
2064 entry
= &cas
->entry
[cas
->nr
++];
2065 memset(entry
, 0, sizeof(*entry
));
2066 entry
->refname
= xmemdupz(refname
, refnamelen
);
2070 int parse_push_cas_option(struct push_cas_option
*cas
, const char *arg
, int unset
)
2073 struct push_cas
*entry
;
2076 /* "--no-<option>" */
2077 clear_cas_option(cas
);
2082 /* just "--<option>" */
2083 cas
->use_tracking_for_rest
= 1;
2087 /* "--<option>=refname" or "--<option>=refname:value" */
2088 colon
= strchrnul(arg
, ':');
2089 entry
= add_cas_entry(cas
, arg
, colon
- arg
);
2091 entry
->use_tracking
= 1;
2092 else if (get_sha1(colon
+ 1, entry
->expect
))
2093 return error("cannot parse expected object name '%s'", colon
+ 1);
2097 int parseopt_push_cas_option(const struct option
*opt
, const char *arg
, int unset
)
2099 return parse_push_cas_option(opt
->value
, arg
, unset
);
2102 int is_empty_cas(const struct push_cas_option
*cas
)
2104 return !cas
->use_tracking_for_rest
&& !cas
->nr
;
2108 * Look at remote.fetch refspec and see if we have a remote
2109 * tracking branch for the refname there. Fill its current
2111 * If we cannot do so, return negative to signal an error.
2113 static int remote_tracking(struct remote
*remote
, const char *refname
,
2114 unsigned char sha1
[20])
2118 dst
= apply_refspecs(remote
->fetch
, remote
->fetch_refspec_nr
, refname
);
2120 return -1; /* no tracking ref for refname at remote */
2121 if (read_ref(dst
, sha1
))
2122 return -1; /* we know what the tracking ref is but we cannot read it */
2126 static void apply_cas(struct push_cas_option
*cas
,
2127 struct remote
*remote
,
2132 /* Find an explicit --<option>=<name>[:<value>] entry */
2133 for (i
= 0; i
< cas
->nr
; i
++) {
2134 struct push_cas
*entry
= &cas
->entry
[i
];
2135 if (!refname_match(entry
->refname
, ref
->name
))
2137 ref
->expect_old_sha1
= 1;
2138 if (!entry
->use_tracking
)
2139 hashcpy(ref
->old_sha1_expect
, cas
->entry
[i
].expect
);
2140 else if (remote_tracking(remote
, ref
->name
, ref
->old_sha1_expect
))
2141 ref
->expect_old_no_trackback
= 1;
2145 /* Are we using "--<option>" to cover all? */
2146 if (!cas
->use_tracking_for_rest
)
2149 ref
->expect_old_sha1
= 1;
2150 if (remote_tracking(remote
, ref
->name
, ref
->old_sha1_expect
))
2151 ref
->expect_old_no_trackback
= 1;
2154 void apply_push_cas(struct push_cas_option
*cas
,
2155 struct remote
*remote
,
2156 struct ref
*remote_refs
)
2159 for (ref
= remote_refs
; ref
; ref
= ref
->next
)
2160 apply_cas(cas
, remote
, ref
);