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 (!prefixcmp(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 (!prefixcmp(buffer
, "URL:")) {
245 } else if (!prefixcmp(buffer
, "Push:")) {
248 } else if (!prefixcmp(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 (!prefixcmp(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 (!prefixcmp(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 (prefixcmp(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
= xstrdup("origin");
487 current_branch
= NULL
;
488 head_ref
= resolve_ref_unsafe("HEAD", sha1
, 0, &flag
);
489 if (head_ref
&& (flag
& REF_ISSYMREF
) &&
490 !prefixcmp(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 struct ref
*ref_remove_duplicates(struct ref
*ref_map
)
750 struct string_list refs
= STRING_LIST_INIT_NODUP
;
751 struct ref
*retval
= NULL
;
752 struct ref
**p
= &retval
;
755 struct ref
*ref
= ref_map
;
757 ref_map
= ref_map
->next
;
760 if (!ref
->peer_ref
) {
764 struct string_list_item
*item
=
765 string_list_insert(&refs
, ref
->peer_ref
->name
);
768 /* Entry already existed */
769 if (strcmp(((struct ref
*)item
->util
)->name
,
771 die("%s tracks both %s and %s",
773 ((struct ref
*)item
->util
)->name
,
785 string_list_clear(&refs
, 0);
789 int remote_has_url(struct remote
*remote
, const char *url
)
792 for (i
= 0; i
< remote
->url_nr
; i
++) {
793 if (!strcmp(remote
->url
[i
], url
))
799 static int match_name_with_pattern(const char *key
, const char *name
,
800 const char *value
, char **result
)
802 const char *kstar
= strchr(key
, '*');
808 die("Key '%s' of pattern had no '*'", key
);
810 ksuffixlen
= strlen(kstar
+ 1);
811 namelen
= strlen(name
);
812 ret
= !strncmp(name
, key
, klen
) && namelen
>= klen
+ ksuffixlen
&&
813 !memcmp(name
+ namelen
- ksuffixlen
, kstar
+ 1, ksuffixlen
);
815 const char *vstar
= strchr(value
, '*');
819 die("Value '%s' of pattern has no '*'", value
);
820 vlen
= vstar
- value
;
821 vsuffixlen
= strlen(vstar
+ 1);
822 *result
= xmalloc(vlen
+ vsuffixlen
+
824 klen
- ksuffixlen
+ 1);
825 strncpy(*result
, value
, vlen
);
826 strncpy(*result
+ vlen
,
827 name
+ klen
, namelen
- klen
- ksuffixlen
);
828 strcpy(*result
+ vlen
+ namelen
- klen
- ksuffixlen
,
834 static int query_refspecs(struct refspec
*refs
, int ref_count
, struct refspec
*query
)
837 int find_src
= !query
->src
;
838 const char *needle
= find_src
? query
->dst
: query
->src
;
839 char **result
= find_src
? &query
->src
: &query
->dst
;
841 if (find_src
&& !query
->dst
)
842 return error("query_refspecs: need either src or dst");
844 for (i
= 0; i
< ref_count
; i
++) {
845 struct refspec
*refspec
= &refs
[i
];
846 const char *key
= find_src
? refspec
->dst
: refspec
->src
;
847 const char *value
= find_src
? refspec
->src
: refspec
->dst
;
851 if (refspec
->pattern
) {
852 if (match_name_with_pattern(key
, needle
, value
, result
)) {
853 query
->force
= refspec
->force
;
856 } else if (!strcmp(needle
, key
)) {
857 *result
= xstrdup(value
);
858 query
->force
= refspec
->force
;
865 char *apply_refspecs(struct refspec
*refspecs
, int nr_refspec
,
868 struct refspec query
;
870 memset(&query
, 0, sizeof(struct refspec
));
871 query
.src
= (char *)name
;
873 if (query_refspecs(refspecs
, nr_refspec
, &query
))
879 int remote_find_tracking(struct remote
*remote
, struct refspec
*refspec
)
881 return query_refspecs(remote
->fetch
, remote
->fetch_refspec_nr
, refspec
);
884 static struct ref
*alloc_ref_with_prefix(const char *prefix
, size_t prefixlen
,
887 size_t len
= strlen(name
);
888 struct ref
*ref
= xcalloc(1, sizeof(struct ref
) + prefixlen
+ len
+ 1);
889 memcpy(ref
->name
, prefix
, prefixlen
);
890 memcpy(ref
->name
+ prefixlen
, name
, len
);
894 struct ref
*alloc_ref(const char *name
)
896 return alloc_ref_with_prefix("", 0, name
);
899 struct ref
*copy_ref(const struct ref
*ref
)
905 len
= strlen(ref
->name
);
906 cpy
= xmalloc(sizeof(struct ref
) + len
+ 1);
907 memcpy(cpy
, ref
, sizeof(struct ref
) + len
+ 1);
909 cpy
->symref
= ref
->symref
? xstrdup(ref
->symref
) : NULL
;
910 cpy
->remote_status
= ref
->remote_status
? xstrdup(ref
->remote_status
) : NULL
;
911 cpy
->peer_ref
= copy_ref(ref
->peer_ref
);
915 struct ref
*copy_ref_list(const struct ref
*ref
)
917 struct ref
*ret
= NULL
;
918 struct ref
**tail
= &ret
;
920 *tail
= copy_ref(ref
);
922 tail
= &((*tail
)->next
);
927 static void free_ref(struct ref
*ref
)
931 free_ref(ref
->peer_ref
);
932 free(ref
->remote_status
);
937 void free_refs(struct ref
*ref
)
947 int ref_compare_name(const void *va
, const void *vb
)
949 const struct ref
*a
= va
, *b
= vb
;
950 return strcmp(a
->name
, b
->name
);
953 static void *ref_list_get_next(const void *a
)
955 return ((const struct ref
*)a
)->next
;
958 static void ref_list_set_next(void *a
, void *next
)
960 ((struct ref
*)a
)->next
= next
;
963 void sort_ref_list(struct ref
**l
, int (*cmp
)(const void *, const void *))
965 *l
= llist_mergesort(*l
, ref_list_get_next
, ref_list_set_next
, cmp
);
968 static int count_refspec_match(const char *pattern
,
970 struct ref
**matched_ref
)
972 int patlen
= strlen(pattern
);
973 struct ref
*matched_weak
= NULL
;
974 struct ref
*matched
= NULL
;
978 for (weak_match
= match
= 0; refs
; refs
= refs
->next
) {
979 char *name
= refs
->name
;
980 int namelen
= strlen(name
);
982 if (!refname_match(pattern
, name
, ref_rev_parse_rules
))
985 /* A match is "weak" if it is with refs outside
986 * heads or tags, and did not specify the pattern
987 * in full (e.g. "refs/remotes/origin/master") or at
988 * least from the toplevel (e.g. "remotes/origin/master");
989 * otherwise "git push $URL master" would result in
990 * ambiguity between remotes/origin/master and heads/master
991 * at the remote site.
993 if (namelen
!= patlen
&&
994 patlen
!= namelen
- 5 &&
995 prefixcmp(name
, "refs/heads/") &&
996 prefixcmp(name
, "refs/tags/")) {
997 /* We want to catch the case where only weak
998 * matches are found and there are multiple
999 * matches, and where more than one strong
1000 * matches are found, as ambiguous. One
1001 * strong match with zero or more weak matches
1002 * are acceptable as a unique match.
1004 matched_weak
= refs
;
1013 *matched_ref
= matched_weak
;
1017 *matched_ref
= matched
;
1022 static void tail_link_ref(struct ref
*ref
, struct ref
***tail
)
1030 static struct ref
*alloc_delete_ref(void)
1032 struct ref
*ref
= alloc_ref("(delete)");
1033 hashclr(ref
->new_sha1
);
1037 static struct ref
*try_explicit_object_name(const char *name
)
1039 unsigned char sha1
[20];
1043 return alloc_delete_ref();
1044 if (get_sha1(name
, sha1
))
1046 ref
= alloc_ref(name
);
1047 hashcpy(ref
->new_sha1
, sha1
);
1051 static struct ref
*make_linked_ref(const char *name
, struct ref
***tail
)
1053 struct ref
*ret
= alloc_ref(name
);
1054 tail_link_ref(ret
, tail
);
1058 static char *guess_ref(const char *name
, struct ref
*peer
)
1060 struct strbuf buf
= STRBUF_INIT
;
1061 unsigned char sha1
[20];
1063 const char *r
= resolve_ref_unsafe(peer
->name
, sha1
, 1, NULL
);
1067 if (!prefixcmp(r
, "refs/heads/"))
1068 strbuf_addstr(&buf
, "refs/heads/");
1069 else if (!prefixcmp(r
, "refs/tags/"))
1070 strbuf_addstr(&buf
, "refs/tags/");
1074 strbuf_addstr(&buf
, name
);
1075 return strbuf_detach(&buf
, NULL
);
1078 static int match_explicit(struct ref
*src
, struct ref
*dst
,
1079 struct ref
***dst_tail
,
1082 struct ref
*matched_src
, *matched_dst
;
1085 const char *dst_value
= rs
->dst
;
1088 if (rs
->pattern
|| rs
->matching
)
1091 matched_src
= matched_dst
= NULL
;
1092 switch (count_refspec_match(rs
->src
, src
, &matched_src
)) {
1097 /* The source could be in the get_sha1() format
1098 * not a reference name. :refs/other is a
1099 * way to delete 'other' ref at the remote end.
1101 matched_src
= try_explicit_object_name(rs
->src
);
1103 return error("src refspec %s does not match any.", rs
->src
);
1107 return error("src refspec %s matches more than one.", rs
->src
);
1111 unsigned char sha1
[20];
1114 dst_value
= resolve_ref_unsafe(matched_src
->name
, sha1
, 1, &flag
);
1116 ((flag
& REF_ISSYMREF
) &&
1117 prefixcmp(dst_value
, "refs/heads/")))
1118 die("%s cannot be resolved to branch.",
1122 switch (count_refspec_match(dst_value
, dst
, &matched_dst
)) {
1126 if (!memcmp(dst_value
, "refs/", 5))
1127 matched_dst
= make_linked_ref(dst_value
, dst_tail
);
1128 else if (is_null_sha1(matched_src
->new_sha1
))
1129 error("unable to delete '%s': remote ref does not exist",
1131 else if ((dst_guess
= guess_ref(dst_value
, matched_src
)))
1132 matched_dst
= make_linked_ref(dst_guess
, dst_tail
);
1134 error("unable to push to unqualified destination: %s\n"
1135 "The destination refspec neither matches an "
1136 "existing ref on the remote nor\n"
1137 "begins with refs/, and we are unable to "
1138 "guess a prefix based on the source ref.",
1143 error("dst refspec %s matches more than one.",
1149 if (matched_dst
->peer_ref
)
1150 return error("dst ref %s receives from more than one src.",
1153 matched_dst
->peer_ref
= copy_src
? copy_ref(matched_src
) : matched_src
;
1154 matched_dst
->force
= rs
->force
;
1159 static int match_explicit_refs(struct ref
*src
, struct ref
*dst
,
1160 struct ref
***dst_tail
, struct refspec
*rs
,
1164 for (i
= errs
= 0; i
< rs_nr
; i
++)
1165 errs
+= match_explicit(src
, dst
, dst_tail
, &rs
[i
]);
1169 static char *get_ref_match(const struct refspec
*rs
, int rs_nr
, const struct ref
*ref
,
1170 int send_mirror
, int direction
, const struct refspec
**ret_pat
)
1172 const struct refspec
*pat
;
1175 int matching_refs
= -1;
1176 for (i
= 0; i
< rs_nr
; i
++) {
1177 if (rs
[i
].matching
&&
1178 (matching_refs
== -1 || rs
[i
].force
)) {
1183 if (rs
[i
].pattern
) {
1184 const char *dst_side
= rs
[i
].dst
? rs
[i
].dst
: rs
[i
].src
;
1186 if (direction
== FROM_SRC
)
1187 match
= match_name_with_pattern(rs
[i
].src
, ref
->name
, dst_side
, &name
);
1189 match
= match_name_with_pattern(dst_side
, ref
->name
, rs
[i
].src
, &name
);
1196 if (matching_refs
== -1)
1199 pat
= rs
+ matching_refs
;
1200 if (pat
->matching
) {
1202 * "matching refs"; traditionally we pushed everything
1203 * including refs outside refs/heads/ hierarchy, but
1204 * that does not make much sense these days.
1206 if (!send_mirror
&& prefixcmp(ref
->name
, "refs/heads/"))
1208 name
= xstrdup(ref
->name
);
1215 static struct ref
**tail_ref(struct ref
**head
)
1217 struct ref
**tail
= head
;
1219 tail
= &((*tail
)->next
);
1224 struct commit
**tip
;
1228 static void add_to_tips(struct tips
*tips
, const unsigned char *sha1
)
1230 struct commit
*commit
;
1232 if (is_null_sha1(sha1
))
1234 commit
= lookup_commit_reference_gently(sha1
, 1);
1235 if (!commit
|| (commit
->object
.flags
& TMP_MARK
))
1237 commit
->object
.flags
|= TMP_MARK
;
1238 ALLOC_GROW(tips
->tip
, tips
->nr
+ 1, tips
->alloc
);
1239 tips
->tip
[tips
->nr
++] = commit
;
1242 static void add_missing_tags(struct ref
*src
, struct ref
**dst
, struct ref
***dst_tail
)
1244 struct string_list dst_tag
= STRING_LIST_INIT_NODUP
;
1245 struct string_list src_tag
= STRING_LIST_INIT_NODUP
;
1246 struct string_list_item
*item
;
1248 struct tips sent_tips
;
1251 * Collect everything we know they would have at the end of
1252 * this push, and collect all tags they have.
1254 memset(&sent_tips
, 0, sizeof(sent_tips
));
1255 for (ref
= *dst
; ref
; ref
= ref
->next
) {
1256 if (ref
->peer_ref
&&
1257 !is_null_sha1(ref
->peer_ref
->new_sha1
))
1258 add_to_tips(&sent_tips
, ref
->peer_ref
->new_sha1
);
1260 add_to_tips(&sent_tips
, ref
->old_sha1
);
1261 if (!prefixcmp(ref
->name
, "refs/tags/"))
1262 string_list_append(&dst_tag
, ref
->name
);
1264 clear_commit_marks_many(sent_tips
.nr
, sent_tips
.tip
, TMP_MARK
);
1266 sort_string_list(&dst_tag
);
1268 /* Collect tags they do not have. */
1269 for (ref
= src
; ref
; ref
= ref
->next
) {
1270 if (prefixcmp(ref
->name
, "refs/tags/"))
1271 continue; /* not a tag */
1272 if (string_list_has_string(&dst_tag
, ref
->name
))
1273 continue; /* they already have it */
1274 if (sha1_object_info(ref
->new_sha1
, NULL
) != OBJ_TAG
)
1275 continue; /* be conservative */
1276 item
= string_list_append(&src_tag
, ref
->name
);
1279 string_list_clear(&dst_tag
, 0);
1282 * At this point, src_tag lists tags that are missing from
1283 * dst, and sent_tips lists the tips we are pushing or those
1284 * that we know they already have. An element in the src_tag
1285 * that is an ancestor of any of the sent_tips needs to be
1286 * sent to the other side.
1289 for_each_string_list_item(item
, &src_tag
) {
1290 struct ref
*ref
= item
->util
;
1291 struct ref
*dst_ref
;
1292 struct commit
*commit
;
1294 if (is_null_sha1(ref
->new_sha1
))
1296 commit
= lookup_commit_reference_gently(ref
->new_sha1
, 1);
1298 /* not pushing a commit, which is not an error */
1302 * Is this tag, which they do not have, reachable from
1303 * any of the commits we are sending?
1305 if (!in_merge_bases_many(commit
, sent_tips
.nr
, sent_tips
.tip
))
1309 dst_ref
= make_linked_ref(ref
->name
, dst_tail
);
1310 hashcpy(dst_ref
->new_sha1
, ref
->new_sha1
);
1311 dst_ref
->peer_ref
= copy_ref(ref
);
1314 string_list_clear(&src_tag
, 0);
1315 free(sent_tips
.tip
);
1318 struct ref
*find_ref_by_name(const struct ref
*list
, const char *name
)
1320 for ( ; list
; list
= list
->next
)
1321 if (!strcmp(list
->name
, name
))
1322 return (struct ref
*)list
;
1326 static void prepare_ref_index(struct string_list
*ref_index
, struct ref
*ref
)
1328 for ( ; ref
; ref
= ref
->next
)
1329 string_list_append_nodup(ref_index
, ref
->name
)->util
= ref
;
1331 sort_string_list(ref_index
);
1335 * Given the set of refs the local repository has, the set of refs the
1336 * remote repository has, and the refspec used for push, determine
1337 * what remote refs we will update and with what value by setting
1338 * peer_ref (which object is being pushed) and force (if the push is
1339 * forced) in elements of "dst". The function may add new elements to
1340 * dst (e.g. pushing to a new branch, done in match_explicit_refs).
1342 int match_push_refs(struct ref
*src
, struct ref
**dst
,
1343 int nr_refspec
, const char **refspec
, int flags
)
1346 int send_all
= flags
& MATCH_REFS_ALL
;
1347 int send_mirror
= flags
& MATCH_REFS_MIRROR
;
1348 int send_prune
= flags
& MATCH_REFS_PRUNE
;
1350 static const char *default_refspec
[] = { ":", NULL
};
1351 struct ref
*ref
, **dst_tail
= tail_ref(dst
);
1352 struct string_list dst_ref_index
= STRING_LIST_INIT_NODUP
;
1356 refspec
= default_refspec
;
1358 rs
= parse_push_refspec(nr_refspec
, (const char **) refspec
);
1359 errs
= match_explicit_refs(src
, *dst
, &dst_tail
, rs
, nr_refspec
);
1361 /* pick the remainder */
1362 for (ref
= src
; ref
; ref
= ref
->next
) {
1363 struct string_list_item
*dst_item
;
1364 struct ref
*dst_peer
;
1365 const struct refspec
*pat
= NULL
;
1368 dst_name
= get_ref_match(rs
, nr_refspec
, ref
, send_mirror
, FROM_SRC
, &pat
);
1372 if (!dst_ref_index
.nr
)
1373 prepare_ref_index(&dst_ref_index
, *dst
);
1375 dst_item
= string_list_lookup(&dst_ref_index
, dst_name
);
1376 dst_peer
= dst_item
? dst_item
->util
: NULL
;
1378 if (dst_peer
->peer_ref
)
1379 /* We're already sending something to this ref. */
1382 if (pat
->matching
&& !(send_all
|| send_mirror
))
1384 * Remote doesn't have it, and we have no
1385 * explicit pattern, and we don't have
1386 * --all nor --mirror.
1390 /* Create a new one and link it */
1391 dst_peer
= make_linked_ref(dst_name
, &dst_tail
);
1392 hashcpy(dst_peer
->new_sha1
, ref
->new_sha1
);
1393 string_list_insert(&dst_ref_index
,
1394 dst_peer
->name
)->util
= dst_peer
;
1396 dst_peer
->peer_ref
= copy_ref(ref
);
1397 dst_peer
->force
= pat
->force
;
1402 string_list_clear(&dst_ref_index
, 0);
1404 if (flags
& MATCH_REFS_FOLLOW_TAGS
)
1405 add_missing_tags(src
, dst
, &dst_tail
);
1408 struct string_list src_ref_index
= STRING_LIST_INIT_NODUP
;
1409 /* check for missing refs on the remote */
1410 for (ref
= *dst
; ref
; ref
= ref
->next
) {
1414 /* We're already sending something to this ref. */
1417 src_name
= get_ref_match(rs
, nr_refspec
, ref
, send_mirror
, FROM_DST
, NULL
);
1419 if (!src_ref_index
.nr
)
1420 prepare_ref_index(&src_ref_index
, src
);
1421 if (!string_list_has_string(&src_ref_index
,
1423 ref
->peer_ref
= alloc_delete_ref();
1427 string_list_clear(&src_ref_index
, 0);
1434 void set_ref_status_for_push(struct ref
*remote_refs
, int send_mirror
,
1439 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
1440 int force_ref_update
= ref
->force
|| force_update
;
1441 int reject_reason
= 0;
1444 hashcpy(ref
->new_sha1
, ref
->peer_ref
->new_sha1
);
1445 else if (!send_mirror
)
1448 ref
->deletion
= is_null_sha1(ref
->new_sha1
);
1449 if (!ref
->deletion
&&
1450 !hashcmp(ref
->old_sha1
, ref
->new_sha1
)) {
1451 ref
->status
= REF_STATUS_UPTODATE
;
1456 * Bypass the usual "must fast-forward" check but
1457 * replace it with a weaker "the old value must be
1458 * this value we observed". If the remote ref has
1459 * moved and is now different from what we expect,
1462 * It also is an error if the user told us to check
1463 * with the remote-tracking branch to find the value
1464 * to expect, but we did not have such a tracking
1467 if (ref
->expect_old_sha1
) {
1468 if (ref
->expect_old_no_trackback
||
1469 hashcmp(ref
->old_sha1
, ref
->old_sha1_expect
))
1470 reject_reason
= REF_STATUS_REJECT_STALE
;
1474 * The usual "must fast-forward" rules.
1476 * Decide whether an individual refspec A:B can be
1477 * pushed. The push will succeed if any of the
1478 * following are true:
1480 * (1) the remote reference B does not exist
1482 * (2) the remote reference B is being removed (i.e.,
1483 * pushing :B where no source is specified)
1485 * (3) the destination is not under refs/tags/, and
1486 * if the old and new value is a commit, the new
1487 * is a descendant of the old.
1489 * (4) it is forced using the +A:B notation, or by
1490 * passing the --force argument
1493 else if (!ref
->deletion
&& !is_null_sha1(ref
->old_sha1
)) {
1494 if (!prefixcmp(ref
->name
, "refs/tags/"))
1495 reject_reason
= REF_STATUS_REJECT_ALREADY_EXISTS
;
1496 else if (!has_sha1_file(ref
->old_sha1
))
1497 reject_reason
= REF_STATUS_REJECT_FETCH_FIRST
;
1498 else if (!lookup_commit_reference_gently(ref
->old_sha1
, 1) ||
1499 !lookup_commit_reference_gently(ref
->new_sha1
, 1))
1500 reject_reason
= REF_STATUS_REJECT_NEEDS_FORCE
;
1501 else if (!ref_newer(ref
->new_sha1
, ref
->old_sha1
))
1502 reject_reason
= REF_STATUS_REJECT_NONFASTFORWARD
;
1506 * "--force" will defeat any rejection implemented
1507 * by the rules above.
1509 if (!force_ref_update
)
1510 ref
->status
= reject_reason
;
1511 else if (reject_reason
)
1512 ref
->forced_update
= 1;
1516 struct branch
*branch_get(const char *name
)
1521 if (!name
|| !*name
|| !strcmp(name
, "HEAD"))
1522 ret
= current_branch
;
1524 ret
= make_branch(name
, 0);
1525 if (ret
&& ret
->remote_name
) {
1526 ret
->remote
= remote_get(ret
->remote_name
);
1527 if (ret
->merge_nr
) {
1529 ret
->merge
= xcalloc(ret
->merge_nr
, sizeof(*ret
->merge
));
1530 for (i
= 0; i
< ret
->merge_nr
; i
++) {
1531 ret
->merge
[i
] = xcalloc(1, sizeof(**ret
->merge
));
1532 ret
->merge
[i
]->src
= xstrdup(ret
->merge_name
[i
]);
1533 if (remote_find_tracking(ret
->remote
, ret
->merge
[i
])
1534 && !strcmp(ret
->remote_name
, "."))
1535 ret
->merge
[i
]->dst
= xstrdup(ret
->merge_name
[i
]);
1542 int branch_has_merge_config(struct branch
*branch
)
1544 return branch
&& !!branch
->merge
;
1547 int branch_merge_matches(struct branch
*branch
,
1549 const char *refname
)
1551 if (!branch
|| i
< 0 || i
>= branch
->merge_nr
)
1553 return refname_match(branch
->merge
[i
]->src
, refname
, ref_fetch_rules
);
1556 static int ignore_symref_update(const char *refname
)
1558 unsigned char sha1
[20];
1561 if (!resolve_ref_unsafe(refname
, sha1
, 0, &flag
))
1562 return 0; /* non-existing refs are OK */
1563 return (flag
& REF_ISSYMREF
);
1567 * Create and return a list of (struct ref) consisting of copies of
1568 * each remote_ref that matches refspec. refspec must be a pattern.
1569 * Fill in the copies' peer_ref to describe the local tracking refs to
1570 * which they map. Omit any references that would map to an existing
1571 * local symbolic ref.
1573 static struct ref
*get_expanded_map(const struct ref
*remote_refs
,
1574 const struct refspec
*refspec
)
1576 const struct ref
*ref
;
1577 struct ref
*ret
= NULL
;
1578 struct ref
**tail
= &ret
;
1580 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
1581 char *expn_name
= NULL
;
1583 if (strchr(ref
->name
, '^'))
1584 continue; /* a dereference item */
1585 if (match_name_with_pattern(refspec
->src
, ref
->name
,
1586 refspec
->dst
, &expn_name
) &&
1587 !ignore_symref_update(expn_name
)) {
1588 struct ref
*cpy
= copy_ref(ref
);
1590 cpy
->peer_ref
= alloc_ref(expn_name
);
1592 cpy
->peer_ref
->force
= 1;
1602 static const struct ref
*find_ref_by_name_abbrev(const struct ref
*refs
, const char *name
)
1604 const struct ref
*ref
;
1605 for (ref
= refs
; ref
; ref
= ref
->next
) {
1606 if (refname_match(name
, ref
->name
, ref_fetch_rules
))
1612 struct ref
*get_remote_ref(const struct ref
*remote_refs
, const char *name
)
1614 const struct ref
*ref
= find_ref_by_name_abbrev(remote_refs
, name
);
1619 return copy_ref(ref
);
1622 static struct ref
*get_local_ref(const char *name
)
1624 if (!name
|| name
[0] == '\0')
1627 if (!prefixcmp(name
, "refs/"))
1628 return alloc_ref(name
);
1630 if (!prefixcmp(name
, "heads/") ||
1631 !prefixcmp(name
, "tags/") ||
1632 !prefixcmp(name
, "remotes/"))
1633 return alloc_ref_with_prefix("refs/", 5, name
);
1635 return alloc_ref_with_prefix("refs/heads/", 11, name
);
1638 int get_fetch_map(const struct ref
*remote_refs
,
1639 const struct refspec
*refspec
,
1643 struct ref
*ref_map
, **rmp
;
1645 if (refspec
->pattern
) {
1646 ref_map
= get_expanded_map(remote_refs
, refspec
);
1648 const char *name
= refspec
->src
[0] ? refspec
->src
: "HEAD";
1650 if (refspec
->exact_sha1
) {
1651 ref_map
= alloc_ref(name
);
1652 get_sha1_hex(name
, ref_map
->old_sha1
);
1654 ref_map
= get_remote_ref(remote_refs
, name
);
1656 if (!missing_ok
&& !ref_map
)
1657 die("Couldn't find remote ref %s", name
);
1659 ref_map
->peer_ref
= get_local_ref(refspec
->dst
);
1660 if (ref_map
->peer_ref
&& refspec
->force
)
1661 ref_map
->peer_ref
->force
= 1;
1665 for (rmp
= &ref_map
; *rmp
; ) {
1666 if ((*rmp
)->peer_ref
) {
1667 if (prefixcmp((*rmp
)->peer_ref
->name
, "refs/") ||
1668 check_refname_format((*rmp
)->peer_ref
->name
, 0)) {
1669 struct ref
*ignore
= *rmp
;
1670 error("* Ignoring funny ref '%s' locally",
1671 (*rmp
)->peer_ref
->name
);
1672 *rmp
= (*rmp
)->next
;
1673 free(ignore
->peer_ref
);
1678 rmp
= &((*rmp
)->next
);
1682 tail_link_ref(ref_map
, tail
);
1687 int resolve_remote_symref(struct ref
*ref
, struct ref
*list
)
1691 for (; list
; list
= list
->next
)
1692 if (!strcmp(ref
->symref
, list
->name
)) {
1693 hashcpy(ref
->old_sha1
, list
->old_sha1
);
1699 static void unmark_and_free(struct commit_list
*list
, unsigned int mark
)
1702 struct commit_list
*temp
= list
;
1703 temp
->item
->object
.flags
&= ~mark
;
1709 int ref_newer(const unsigned char *new_sha1
, const unsigned char *old_sha1
)
1712 struct commit
*old
, *new;
1713 struct commit_list
*list
, *used
;
1717 * Both new and old must be commit-ish and new is descendant of
1718 * old. Otherwise we require --force.
1720 o
= deref_tag(parse_object(old_sha1
), NULL
, 0);
1721 if (!o
|| o
->type
!= OBJ_COMMIT
)
1723 old
= (struct commit
*) o
;
1725 o
= deref_tag(parse_object(new_sha1
), NULL
, 0);
1726 if (!o
|| o
->type
!= OBJ_COMMIT
)
1728 new = (struct commit
*) o
;
1730 if (parse_commit(new) < 0)
1734 commit_list_insert(new, &list
);
1736 new = pop_most_recent_commit(&list
, TMP_MARK
);
1737 commit_list_insert(new, &used
);
1743 unmark_and_free(list
, TMP_MARK
);
1744 unmark_and_free(used
, TMP_MARK
);
1749 * Compare a branch with its upstream, and save their differences (number
1750 * of commits) in *num_ours and *num_theirs.
1752 * Return 0 if branch has no upstream (no base), -1 if upstream is missing
1753 * (with "gone" base), otherwise 1 (with base).
1755 int stat_tracking_info(struct branch
*branch
, int *num_ours
, int *num_theirs
)
1757 unsigned char sha1
[20];
1758 struct commit
*ours
, *theirs
;
1760 struct rev_info revs
;
1761 const char *rev_argv
[10], *base
;
1764 /* Cannot stat unless we are marked to build on top of somebody else. */
1766 !branch
->merge
|| !branch
->merge
[0] || !branch
->merge
[0]->dst
)
1769 /* Cannot stat if what we used to build on no longer exists */
1770 base
= branch
->merge
[0]->dst
;
1771 if (read_ref(base
, sha1
))
1773 theirs
= lookup_commit_reference(sha1
);
1777 if (read_ref(branch
->refname
, sha1
))
1779 ours
= lookup_commit_reference(sha1
);
1783 /* are we the same? */
1784 if (theirs
== ours
) {
1785 *num_theirs
= *num_ours
= 0;
1789 /* Run "rev-list --left-right ours...theirs" internally... */
1791 rev_argv
[rev_argc
++] = NULL
;
1792 rev_argv
[rev_argc
++] = "--left-right";
1793 rev_argv
[rev_argc
++] = symmetric
;
1794 rev_argv
[rev_argc
++] = "--";
1795 rev_argv
[rev_argc
] = NULL
;
1797 strcpy(symmetric
, sha1_to_hex(ours
->object
.sha1
));
1798 strcpy(symmetric
+ 40, "...");
1799 strcpy(symmetric
+ 43, sha1_to_hex(theirs
->object
.sha1
));
1801 init_revisions(&revs
, NULL
);
1802 setup_revisions(rev_argc
, rev_argv
, &revs
, NULL
);
1803 prepare_revision_walk(&revs
);
1805 /* ... and count the commits on each side. */
1809 struct commit
*c
= get_revision(&revs
);
1812 if (c
->object
.flags
& SYMMETRIC_LEFT
)
1818 /* clear object flags smudged by the above traversal */
1819 clear_commit_marks(ours
, ALL_REV_FLAGS
);
1820 clear_commit_marks(theirs
, ALL_REV_FLAGS
);
1825 * Return true when there is anything to report, otherwise false.
1827 int format_tracking_info(struct branch
*branch
, struct strbuf
*sb
)
1831 int upstream_is_gone
= 0;
1833 switch (stat_tracking_info(branch
, &ours
, &theirs
)) {
1838 /* with "gone" base */
1839 upstream_is_gone
= 1;
1846 base
= branch
->merge
[0]->dst
;
1847 base
= shorten_unambiguous_ref(base
, 0);
1848 if (upstream_is_gone
) {
1850 _("Your branch is based on '%s', but the upstream is gone.\n"),
1852 if (advice_status_hints
)
1854 _(" (use \"git branch --unset-upstream\" to fixup)\n"));
1855 } else if (!ours
&& !theirs
) {
1857 _("Your branch is up-to-date with '%s'.\n"),
1859 } else if (!theirs
) {
1861 Q_("Your branch is ahead of '%s' by %d commit.\n",
1862 "Your branch is ahead of '%s' by %d commits.\n",
1865 if (advice_status_hints
)
1867 _(" (use \"git push\" to publish your local commits)\n"));
1870 Q_("Your branch is behind '%s' by %d commit, "
1871 "and can be fast-forwarded.\n",
1872 "Your branch is behind '%s' by %d commits, "
1873 "and can be fast-forwarded.\n",
1876 if (advice_status_hints
)
1878 _(" (use \"git pull\" to update your local branch)\n"));
1881 Q_("Your branch and '%s' have diverged,\n"
1882 "and have %d and %d different commit each, "
1884 "Your branch and '%s' have diverged,\n"
1885 "and have %d and %d different commits each, "
1888 base
, ours
, theirs
);
1889 if (advice_status_hints
)
1891 _(" (use \"git pull\" to merge the remote branch into yours)\n"));
1896 static int one_local_ref(const char *refname
, const unsigned char *sha1
, int flag
, void *cb_data
)
1898 struct ref
***local_tail
= cb_data
;
1902 /* we already know it starts with refs/ to get here */
1903 if (check_refname_format(refname
+ 5, 0))
1906 len
= strlen(refname
) + 1;
1907 ref
= xcalloc(1, sizeof(*ref
) + len
);
1908 hashcpy(ref
->new_sha1
, sha1
);
1909 memcpy(ref
->name
, refname
, len
);
1911 *local_tail
= &ref
->next
;
1915 struct ref
*get_local_heads(void)
1917 struct ref
*local_refs
= NULL
, **local_tail
= &local_refs
;
1918 for_each_ref(one_local_ref
, &local_tail
);
1922 struct ref
*guess_remote_head(const struct ref
*head
,
1923 const struct ref
*refs
,
1926 const struct ref
*r
;
1927 struct ref
*list
= NULL
;
1928 struct ref
**tail
= &list
;
1934 * Some transports support directly peeking at
1935 * where HEAD points; if that is the case, then
1936 * we don't have to guess.
1939 return copy_ref(find_ref_by_name(refs
, head
->symref
));
1941 /* If refs/heads/master could be right, it is. */
1943 r
= find_ref_by_name(refs
, "refs/heads/master");
1944 if (r
&& !hashcmp(r
->old_sha1
, head
->old_sha1
))
1948 /* Look for another ref that points there */
1949 for (r
= refs
; r
; r
= r
->next
) {
1951 !prefixcmp(r
->name
, "refs/heads/") &&
1952 !hashcmp(r
->old_sha1
, head
->old_sha1
)) {
1953 *tail
= copy_ref(r
);
1954 tail
= &((*tail
)->next
);
1963 struct stale_heads_info
{
1964 struct string_list
*ref_names
;
1965 struct ref
**stale_refs_tail
;
1966 struct refspec
*refs
;
1970 static int get_stale_heads_cb(const char *refname
,
1971 const unsigned char *sha1
, int flags
, void *cb_data
)
1973 struct stale_heads_info
*info
= cb_data
;
1974 struct refspec query
;
1975 memset(&query
, 0, sizeof(struct refspec
));
1976 query
.dst
= (char *)refname
;
1978 if (query_refspecs(info
->refs
, info
->ref_count
, &query
))
1979 return 0; /* No matches */
1982 * If we did find a suitable refspec and it's not a symref and
1983 * it's not in the list of refs that currently exist in that
1984 * remote we consider it to be stale.
1986 if (!((flags
& REF_ISSYMREF
) ||
1987 string_list_has_string(info
->ref_names
, query
.src
))) {
1988 struct ref
*ref
= make_linked_ref(refname
, &info
->stale_refs_tail
);
1989 hashcpy(ref
->new_sha1
, sha1
);
1996 struct ref
*get_stale_heads(struct refspec
*refs
, int ref_count
, struct ref
*fetch_map
)
1998 struct ref
*ref
, *stale_refs
= NULL
;
1999 struct string_list ref_names
= STRING_LIST_INIT_NODUP
;
2000 struct stale_heads_info info
;
2001 info
.ref_names
= &ref_names
;
2002 info
.stale_refs_tail
= &stale_refs
;
2004 info
.ref_count
= ref_count
;
2005 for (ref
= fetch_map
; ref
; ref
= ref
->next
)
2006 string_list_append(&ref_names
, ref
->name
);
2007 sort_string_list(&ref_names
);
2008 for_each_ref(get_stale_heads_cb
, &info
);
2009 string_list_clear(&ref_names
, 0);
2016 void clear_cas_option(struct push_cas_option
*cas
)
2020 for (i
= 0; i
< cas
->nr
; i
++)
2021 free(cas
->entry
[i
].refname
);
2023 memset(cas
, 0, sizeof(*cas
));
2026 static struct push_cas
*add_cas_entry(struct push_cas_option
*cas
,
2027 const char *refname
,
2030 struct push_cas
*entry
;
2031 ALLOC_GROW(cas
->entry
, cas
->nr
+ 1, cas
->alloc
);
2032 entry
= &cas
->entry
[cas
->nr
++];
2033 memset(entry
, 0, sizeof(*entry
));
2034 entry
->refname
= xmemdupz(refname
, refnamelen
);
2038 int parse_push_cas_option(struct push_cas_option
*cas
, const char *arg
, int unset
)
2041 struct push_cas
*entry
;
2044 /* "--no-<option>" */
2045 clear_cas_option(cas
);
2050 /* just "--<option>" */
2051 cas
->use_tracking_for_rest
= 1;
2055 /* "--<option>=refname" or "--<option>=refname:value" */
2056 colon
= strchrnul(arg
, ':');
2057 entry
= add_cas_entry(cas
, arg
, colon
- arg
);
2059 entry
->use_tracking
= 1;
2060 else if (get_sha1(colon
+ 1, entry
->expect
))
2061 return error("cannot parse expected object name '%s'", colon
+ 1);
2065 int parseopt_push_cas_option(const struct option
*opt
, const char *arg
, int unset
)
2067 return parse_push_cas_option(opt
->value
, arg
, unset
);
2070 int is_empty_cas(const struct push_cas_option
*cas
)
2072 return !cas
->use_tracking_for_rest
&& !cas
->nr
;
2076 * Look at remote.fetch refspec and see if we have a remote
2077 * tracking branch for the refname there. Fill its current
2079 * If we cannot do so, return negative to signal an error.
2081 static int remote_tracking(struct remote
*remote
, const char *refname
,
2082 unsigned char sha1
[20])
2086 dst
= apply_refspecs(remote
->fetch
, remote
->fetch_refspec_nr
, refname
);
2088 return -1; /* no tracking ref for refname at remote */
2089 if (read_ref(dst
, sha1
))
2090 return -1; /* we know what the tracking ref is but we cannot read it */
2094 static void apply_cas(struct push_cas_option
*cas
,
2095 struct remote
*remote
,
2100 /* Find an explicit --<option>=<name>[:<value>] entry */
2101 for (i
= 0; i
< cas
->nr
; i
++) {
2102 struct push_cas
*entry
= &cas
->entry
[i
];
2103 if (!refname_match(entry
->refname
, ref
->name
, ref_rev_parse_rules
))
2105 ref
->expect_old_sha1
= 1;
2106 if (!entry
->use_tracking
)
2107 hashcpy(ref
->old_sha1_expect
, cas
->entry
[i
].expect
);
2108 else if (remote_tracking(remote
, ref
->name
, ref
->old_sha1_expect
))
2109 ref
->expect_old_no_trackback
= 1;
2113 /* Are we using "--<option>" to cover all? */
2114 if (!cas
->use_tracking_for_rest
)
2117 ref
->expect_old_sha1
= 1;
2118 if (remote_tracking(remote
, ref
->name
, ref
->old_sha1_expect
))
2119 ref
->expect_old_no_trackback
= 1;
2122 void apply_push_cas(struct push_cas_option
*cas
,
2123 struct remote
*remote
,
2124 struct ref
*remote_refs
)
2127 for (ref
= remote_refs
; ref
; ref
= ref
->next
)
2128 apply_cas(cas
, remote
, ref
);