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 ALLOC_GROW(remotes
, remotes_nr
+ 1, remotes_alloc
);
152 remotes
[remotes_nr
++] = ret
;
154 ret
->name
= xstrndup(name
, len
);
156 ret
->name
= xstrdup(name
);
160 static void add_merge(struct branch
*branch
, const char *name
)
162 ALLOC_GROW(branch
->merge_name
, branch
->merge_nr
+ 1,
163 branch
->merge_alloc
);
164 branch
->merge_name
[branch
->merge_nr
++] = name
;
167 static struct branch
*make_branch(const char *name
, int len
)
173 for (i
= 0; i
< branches_nr
; i
++) {
174 if (len
? (!strncmp(name
, branches
[i
]->name
, len
) &&
175 !branches
[i
]->name
[len
]) :
176 !strcmp(name
, branches
[i
]->name
))
180 ALLOC_GROW(branches
, branches_nr
+ 1, branches_alloc
);
181 ret
= xcalloc(1, sizeof(struct branch
));
182 branches
[branches_nr
++] = ret
;
184 ret
->name
= xstrndup(name
, len
);
186 ret
->name
= xstrdup(name
);
187 refname
= xmalloc(strlen(name
) + strlen("refs/heads/") + 1);
188 strcpy(refname
, "refs/heads/");
189 strcpy(refname
+ strlen("refs/heads/"), ret
->name
);
190 ret
->refname
= refname
;
195 static struct rewrite
*make_rewrite(struct rewrites
*r
, const char *base
, int len
)
200 for (i
= 0; i
< r
->rewrite_nr
; i
++) {
202 ? (len
== r
->rewrite
[i
]->baselen
&&
203 !strncmp(base
, r
->rewrite
[i
]->base
, len
))
204 : !strcmp(base
, r
->rewrite
[i
]->base
))
205 return r
->rewrite
[i
];
208 ALLOC_GROW(r
->rewrite
, r
->rewrite_nr
+ 1, r
->rewrite_alloc
);
209 ret
= xcalloc(1, sizeof(struct rewrite
));
210 r
->rewrite
[r
->rewrite_nr
++] = ret
;
212 ret
->base
= xstrndup(base
, len
);
216 ret
->base
= xstrdup(base
);
217 ret
->baselen
= strlen(base
);
222 static void add_instead_of(struct rewrite
*rewrite
, const char *instead_of
)
224 ALLOC_GROW(rewrite
->instead_of
, rewrite
->instead_of_nr
+ 1, rewrite
->instead_of_alloc
);
225 rewrite
->instead_of
[rewrite
->instead_of_nr
].s
= instead_of
;
226 rewrite
->instead_of
[rewrite
->instead_of_nr
].len
= strlen(instead_of
);
227 rewrite
->instead_of_nr
++;
230 static void read_remotes_file(struct remote
*remote
)
232 FILE *f
= fopen(git_path("remotes/%s", remote
->name
), "r");
236 remote
->origin
= REMOTE_REMOTES
;
237 while (fgets(buffer
, BUF_SIZE
, f
)) {
241 if (!prefixcmp(buffer
, "URL:")) {
244 } else if (!prefixcmp(buffer
, "Push:")) {
247 } else if (!prefixcmp(buffer
, "Pull:")) {
259 while (isspace(p
[-1]))
262 switch (value_list
) {
264 add_url_alias(remote
, xstrdup(s
));
267 add_push_refspec(remote
, xstrdup(s
));
270 add_fetch_refspec(remote
, xstrdup(s
));
277 static void read_branches_file(struct remote
*remote
)
279 const char *slash
= strchr(remote
->name
, '/');
281 struct strbuf branch
= STRBUF_INIT
;
282 int n
= slash
? slash
- remote
->name
: 1000;
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]))
303 len
+= strlen(slash
);
304 p
= xmalloc(len
+ 1);
310 * With "slash", e.g. "git fetch jgarzik/netdev-2.6" when
311 * reading from $GIT_DIR/branches/jgarzik fetches "HEAD" from
312 * the partial URL obtained from the branches file plus
313 * "/netdev-2.6" and does not store it in any tracking ref.
314 * #branch specifier in the file is ignored.
316 * Otherwise, the branches file would have URL and optionally
317 * #branch specified. The "master" (or specified) branch is
318 * fetched and stored in the local branch of the same name.
320 frag
= strchr(p
, '#');
323 strbuf_addf(&branch
, "refs/heads/%s", frag
);
325 strbuf_addstr(&branch
, "refs/heads/master");
327 strbuf_addf(&branch
, ":refs/heads/%s", remote
->name
);
329 strbuf_reset(&branch
);
330 strbuf_addstr(&branch
, "HEAD:");
332 add_url_alias(remote
, p
);
333 add_fetch_refspec(remote
, strbuf_detach(&branch
, NULL
));
335 * Cogito compatible push: push current HEAD to remote #branch
336 * (master if missing)
338 strbuf_init(&branch
, 0);
339 strbuf_addstr(&branch
, "HEAD");
341 strbuf_addf(&branch
, ":refs/heads/%s", frag
);
343 strbuf_addstr(&branch
, ":refs/heads/master");
344 add_push_refspec(remote
, strbuf_detach(&branch
, NULL
));
345 remote
->fetch_tags
= 1; /* always auto-follow */
348 static int handle_config(const char *key
, const char *value
, void *cb
)
352 struct remote
*remote
;
353 struct branch
*branch
;
354 if (!prefixcmp(key
, "branch.")) {
356 subkey
= strrchr(name
, '.');
359 branch
= make_branch(name
, subkey
- name
);
360 if (!strcmp(subkey
, ".remote")) {
361 if (git_config_string(&branch
->remote_name
, key
, value
))
363 if (branch
== current_branch
) {
364 default_remote_name
= branch
->remote_name
;
365 explicit_default_remote_name
= 1;
367 } else if (!strcmp(subkey
, ".merge")) {
369 return config_error_nonbool(key
);
370 add_merge(branch
, xstrdup(value
));
374 if (!prefixcmp(key
, "url.")) {
375 struct rewrite
*rewrite
;
377 subkey
= strrchr(name
, '.');
380 if (!strcmp(subkey
, ".insteadof")) {
381 rewrite
= make_rewrite(&rewrites
, name
, subkey
- name
);
383 return config_error_nonbool(key
);
384 add_instead_of(rewrite
, xstrdup(value
));
385 } else if (!strcmp(subkey
, ".pushinsteadof")) {
386 rewrite
= make_rewrite(&rewrites_push
, name
, subkey
- name
);
388 return config_error_nonbool(key
);
389 add_instead_of(rewrite
, xstrdup(value
));
393 if (prefixcmp(key
, "remote."))
397 /* Handle remote.* variables */
398 if (!strcmp(name
, "pushdefault"))
399 return git_config_string(&pushremote_name
, key
, value
);
401 /* Handle remote.<name>.* variables */
403 warning("Config remote shorthand cannot begin with '/': %s",
407 subkey
= strrchr(name
, '.');
410 remote
= make_remote(name
, subkey
- name
);
411 remote
->origin
= REMOTE_CONFIG
;
412 if (!strcmp(subkey
, ".mirror"))
413 remote
->mirror
= git_config_bool(key
, value
);
414 else if (!strcmp(subkey
, ".skipdefaultupdate"))
415 remote
->skip_default_update
= git_config_bool(key
, value
);
416 else if (!strcmp(subkey
, ".skipfetchall"))
417 remote
->skip_default_update
= git_config_bool(key
, value
);
418 else if (!strcmp(subkey
, ".url")) {
420 if (git_config_string(&v
, key
, value
))
423 } else if (!strcmp(subkey
, ".pushurl")) {
425 if (git_config_string(&v
, key
, value
))
427 add_pushurl(remote
, v
);
428 } else if (!strcmp(subkey
, ".push")) {
430 if (git_config_string(&v
, key
, value
))
432 add_push_refspec(remote
, v
);
433 } else if (!strcmp(subkey
, ".fetch")) {
435 if (git_config_string(&v
, key
, value
))
437 add_fetch_refspec(remote
, v
);
438 } else if (!strcmp(subkey
, ".receivepack")) {
440 if (git_config_string(&v
, key
, value
))
442 if (!remote
->receivepack
)
443 remote
->receivepack
= v
;
445 error("more than one receivepack given, using the first");
446 } else if (!strcmp(subkey
, ".uploadpack")) {
448 if (git_config_string(&v
, key
, value
))
450 if (!remote
->uploadpack
)
451 remote
->uploadpack
= v
;
453 error("more than one uploadpack given, using the first");
454 } else if (!strcmp(subkey
, ".tagopt")) {
455 if (!strcmp(value
, "--no-tags"))
456 remote
->fetch_tags
= -1;
457 else if (!strcmp(value
, "--tags"))
458 remote
->fetch_tags
= 2;
459 } else if (!strcmp(subkey
, ".proxy")) {
460 return git_config_string((const char **)&remote
->http_proxy
,
462 } else if (!strcmp(subkey
, ".vcs")) {
463 return git_config_string(&remote
->foreign_vcs
, key
, value
);
468 static void alias_all_urls(void)
471 for (i
= 0; i
< remotes_nr
; i
++) {
472 int add_pushurl_aliases
;
475 for (j
= 0; j
< remotes
[i
]->pushurl_nr
; j
++) {
476 remotes
[i
]->pushurl
[j
] = alias_url(remotes
[i
]->pushurl
[j
], &rewrites
);
478 add_pushurl_aliases
= remotes
[i
]->pushurl_nr
== 0;
479 for (j
= 0; j
< remotes
[i
]->url_nr
; j
++) {
480 if (add_pushurl_aliases
)
481 add_pushurl_alias(remotes
[i
], remotes
[i
]->url
[j
]);
482 remotes
[i
]->url
[j
] = alias_url(remotes
[i
]->url
[j
], &rewrites
);
487 static void read_config(void)
489 unsigned char sha1
[20];
490 const char *head_ref
;
492 if (default_remote_name
) /* did this already */
494 default_remote_name
= xstrdup("origin");
495 current_branch
= NULL
;
496 head_ref
= resolve_ref_unsafe("HEAD", sha1
, 0, &flag
);
497 if (head_ref
&& (flag
& REF_ISSYMREF
) &&
498 !prefixcmp(head_ref
, "refs/heads/")) {
500 make_branch(head_ref
+ strlen("refs/heads/"), 0);
502 git_config(handle_config
, NULL
);
507 * This function frees a refspec array.
508 * Warning: code paths should be checked to ensure that the src
509 * and dst pointers are always freeable pointers as well
510 * as the refspec pointer itself.
512 static void free_refspecs(struct refspec
*refspec
, int nr_refspec
)
519 for (i
= 0; i
< nr_refspec
; i
++) {
520 free(refspec
[i
].src
);
521 free(refspec
[i
].dst
);
526 static struct refspec
*parse_refspec_internal(int nr_refspec
, const char **refspec
, int fetch
, int verify
)
529 struct refspec
*rs
= xcalloc(sizeof(*rs
), nr_refspec
);
531 for (i
= 0; i
< nr_refspec
; i
++) {
534 const char *lhs
, *rhs
;
545 rhs
= strrchr(lhs
, ':');
548 * Before going on, special case ":" (or "+:") as a refspec
549 * for pushing matching refs.
551 if (!fetch
&& rhs
== lhs
&& rhs
[1] == '\0') {
557 size_t rlen
= strlen(++rhs
);
558 is_glob
= (1 <= rlen
&& strchr(rhs
, '*'));
559 rs
[i
].dst
= xstrndup(rhs
, rlen
);
562 llen
= (rhs
? (rhs
- lhs
- 1) : strlen(lhs
));
563 if (1 <= llen
&& memchr(lhs
, '*', llen
)) {
564 if ((rhs
&& !is_glob
) || (!rhs
&& fetch
))
567 } else if (rhs
&& is_glob
) {
571 rs
[i
].pattern
= is_glob
;
572 rs
[i
].src
= xstrndup(lhs
, llen
);
573 flags
= REFNAME_ALLOW_ONELEVEL
| (is_glob
? REFNAME_REFSPEC_PATTERN
: 0);
576 unsigned char unused
[40];
580 ; /* empty is ok; it means "HEAD" */
581 else if (llen
== 40 && !get_sha1_hex(rs
[i
].src
, unused
))
582 rs
[i
].exact_sha1
= 1; /* ok */
583 else if (!check_refname_format(rs
[i
].src
, flags
))
584 ; /* valid looking ref is ok */
589 ; /* missing is ok; it is the same as empty */
590 else if (!*rs
[i
].dst
)
591 ; /* empty is ok; it means "do not store" */
592 else if (!check_refname_format(rs
[i
].dst
, flags
))
593 ; /* valid looking ref is ok */
599 * - empty is allowed; it means delete.
600 * - when wildcarded, it must be a valid looking ref.
601 * - otherwise, it must be an extended SHA-1, but
602 * there is no existing way to validate this.
607 if (check_refname_format(rs
[i
].src
, flags
))
611 ; /* anything goes, for now */
614 * - missing is allowed, but LHS then must be a
616 * - empty is not allowed.
617 * - otherwise it must be a valid looking ref.
620 if (check_refname_format(rs
[i
].src
, flags
))
622 } else if (!*rs
[i
].dst
) {
625 if (check_refname_format(rs
[i
].dst
, flags
))
635 * nr_refspec must be greater than zero and i must be valid
636 * since it is only possible to reach this point from within
637 * the for loop above.
639 free_refspecs(rs
, i
+1);
642 die("Invalid refspec '%s'", refspec
[i
]);
645 int valid_fetch_refspec(const char *fetch_refspec_str
)
647 struct refspec
*refspec
;
649 refspec
= parse_refspec_internal(1, &fetch_refspec_str
, 1, 1);
650 free_refspecs(refspec
, 1);
654 struct refspec
*parse_fetch_refspec(int nr_refspec
, const char **refspec
)
656 return parse_refspec_internal(nr_refspec
, refspec
, 1, 0);
659 static struct refspec
*parse_push_refspec(int nr_refspec
, const char **refspec
)
661 return parse_refspec_internal(nr_refspec
, refspec
, 0, 0);
664 void free_refspec(int nr_refspec
, struct refspec
*refspec
)
667 for (i
= 0; i
< nr_refspec
; i
++) {
668 free(refspec
[i
].src
);
669 free(refspec
[i
].dst
);
674 static int valid_remote_nick(const char *name
)
676 if (!name
[0] || is_dot_or_dotdot(name
))
678 return !strchr(name
, '/'); /* no slash */
681 static struct remote
*remote_get_1(const char *name
, const char *pushremote_name
)
689 if (pushremote_name
) {
690 name
= pushremote_name
;
693 name
= default_remote_name
;
694 name_given
= explicit_default_remote_name
;
698 ret
= make_remote(name
, 0);
699 if (valid_remote_nick(name
)) {
700 if (!valid_remote(ret
))
701 read_remotes_file(ret
);
702 if (!valid_remote(ret
))
703 read_branches_file(ret
);
705 if (name_given
&& !valid_remote(ret
))
706 add_url_alias(ret
, name
);
707 if (!valid_remote(ret
))
709 ret
->fetch
= parse_fetch_refspec(ret
->fetch_refspec_nr
, ret
->fetch_refspec
);
710 ret
->push
= parse_push_refspec(ret
->push_refspec_nr
, ret
->push_refspec
);
714 struct remote
*remote_get(const char *name
)
717 return remote_get_1(name
, NULL
);
720 struct remote
*pushremote_get(const char *name
)
723 return remote_get_1(name
, pushremote_name
);
726 int remote_is_configured(const char *name
)
731 for (i
= 0; i
< remotes_nr
; i
++)
732 if (!strcmp(name
, remotes
[i
]->name
))
737 int for_each_remote(each_remote_fn fn
, void *priv
)
741 for (i
= 0; i
< remotes_nr
&& !result
; i
++) {
742 struct remote
*r
= remotes
[i
];
746 r
->fetch
= parse_fetch_refspec(r
->fetch_refspec_nr
,
749 r
->push
= parse_push_refspec(r
->push_refspec_nr
,
751 result
= fn(r
, priv
);
756 void ref_remove_duplicates(struct ref
*ref_map
)
758 struct string_list refs
= STRING_LIST_INIT_NODUP
;
759 struct string_list_item
*item
= NULL
;
760 struct ref
*prev
= NULL
, *next
= NULL
;
761 for (; ref_map
; prev
= ref_map
, ref_map
= next
) {
762 next
= ref_map
->next
;
763 if (!ref_map
->peer_ref
)
766 item
= string_list_lookup(&refs
, ref_map
->peer_ref
->name
);
768 if (strcmp(((struct ref
*)item
->util
)->name
,
770 die("%s tracks both %s and %s",
771 ref_map
->peer_ref
->name
,
772 ((struct ref
*)item
->util
)->name
,
774 prev
->next
= ref_map
->next
;
775 free(ref_map
->peer_ref
);
777 ref_map
= prev
; /* skip this; we freed it */
781 item
= string_list_insert(&refs
, ref_map
->peer_ref
->name
);
782 item
->util
= ref_map
;
784 string_list_clear(&refs
, 0);
787 int remote_has_url(struct remote
*remote
, const char *url
)
790 for (i
= 0; i
< remote
->url_nr
; i
++) {
791 if (!strcmp(remote
->url
[i
], url
))
797 static int match_name_with_pattern(const char *key
, const char *name
,
798 const char *value
, char **result
)
800 const char *kstar
= strchr(key
, '*');
806 die("Key '%s' of pattern had no '*'", key
);
808 ksuffixlen
= strlen(kstar
+ 1);
809 namelen
= strlen(name
);
810 ret
= !strncmp(name
, key
, klen
) && namelen
>= klen
+ ksuffixlen
&&
811 !memcmp(name
+ namelen
- ksuffixlen
, kstar
+ 1, ksuffixlen
);
813 const char *vstar
= strchr(value
, '*');
817 die("Value '%s' of pattern has no '*'", value
);
818 vlen
= vstar
- value
;
819 vsuffixlen
= strlen(vstar
+ 1);
820 *result
= xmalloc(vlen
+ vsuffixlen
+
822 klen
- ksuffixlen
+ 1);
823 strncpy(*result
, value
, vlen
);
824 strncpy(*result
+ vlen
,
825 name
+ klen
, namelen
- klen
- ksuffixlen
);
826 strcpy(*result
+ vlen
+ namelen
- klen
- ksuffixlen
,
832 static int query_refspecs(struct refspec
*refs
, int ref_count
, struct refspec
*query
)
835 int find_src
= !query
->src
;
837 if (find_src
&& !query
->dst
)
838 return error("query_refspecs: need either src or dst");
840 for (i
= 0; i
< ref_count
; i
++) {
841 struct refspec
*refspec
= &refs
[i
];
842 const char *key
= find_src
? refspec
->dst
: refspec
->src
;
843 const char *value
= find_src
? refspec
->src
: refspec
->dst
;
844 const char *needle
= find_src
? query
->dst
: query
->src
;
845 char **result
= find_src
? &query
->src
: &query
->dst
;
849 if (refspec
->pattern
) {
850 if (match_name_with_pattern(key
, needle
, value
, result
)) {
851 query
->force
= refspec
->force
;
854 } else if (!strcmp(needle
, key
)) {
855 *result
= xstrdup(value
);
856 query
->force
= refspec
->force
;
863 char *apply_refspecs(struct refspec
*refspecs
, int nr_refspec
,
866 struct refspec query
;
868 memset(&query
, 0, sizeof(struct refspec
));
869 query
.src
= (char *)name
;
871 if (query_refspecs(refspecs
, nr_refspec
, &query
))
877 int remote_find_tracking(struct remote
*remote
, struct refspec
*refspec
)
879 return query_refspecs(remote
->fetch
, remote
->fetch_refspec_nr
, refspec
);
882 static struct ref
*alloc_ref_with_prefix(const char *prefix
, size_t prefixlen
,
885 size_t len
= strlen(name
);
886 struct ref
*ref
= xcalloc(1, sizeof(struct ref
) + prefixlen
+ len
+ 1);
887 memcpy(ref
->name
, prefix
, prefixlen
);
888 memcpy(ref
->name
+ prefixlen
, name
, len
);
892 struct ref
*alloc_ref(const char *name
)
894 return alloc_ref_with_prefix("", 0, name
);
897 struct ref
*copy_ref(const struct ref
*ref
)
903 len
= strlen(ref
->name
);
904 cpy
= xmalloc(sizeof(struct ref
) + len
+ 1);
905 memcpy(cpy
, ref
, sizeof(struct ref
) + len
+ 1);
907 cpy
->symref
= ref
->symref
? xstrdup(ref
->symref
) : NULL
;
908 cpy
->remote_status
= ref
->remote_status
? xstrdup(ref
->remote_status
) : NULL
;
909 cpy
->peer_ref
= copy_ref(ref
->peer_ref
);
913 struct ref
*copy_ref_list(const struct ref
*ref
)
915 struct ref
*ret
= NULL
;
916 struct ref
**tail
= &ret
;
918 *tail
= copy_ref(ref
);
920 tail
= &((*tail
)->next
);
925 static void free_ref(struct ref
*ref
)
929 free_ref(ref
->peer_ref
);
930 free(ref
->remote_status
);
935 void free_refs(struct ref
*ref
)
945 int ref_compare_name(const void *va
, const void *vb
)
947 const struct ref
*a
= va
, *b
= vb
;
948 return strcmp(a
->name
, b
->name
);
951 static void *ref_list_get_next(const void *a
)
953 return ((const struct ref
*)a
)->next
;
956 static void ref_list_set_next(void *a
, void *next
)
958 ((struct ref
*)a
)->next
= next
;
961 void sort_ref_list(struct ref
**l
, int (*cmp
)(const void *, const void *))
963 *l
= llist_mergesort(*l
, ref_list_get_next
, ref_list_set_next
, cmp
);
966 static int count_refspec_match(const char *pattern
,
968 struct ref
**matched_ref
)
970 int patlen
= strlen(pattern
);
971 struct ref
*matched_weak
= NULL
;
972 struct ref
*matched
= NULL
;
976 for (weak_match
= match
= 0; refs
; refs
= refs
->next
) {
977 char *name
= refs
->name
;
978 int namelen
= strlen(name
);
980 if (!refname_match(pattern
, name
, ref_rev_parse_rules
))
983 /* A match is "weak" if it is with refs outside
984 * heads or tags, and did not specify the pattern
985 * in full (e.g. "refs/remotes/origin/master") or at
986 * least from the toplevel (e.g. "remotes/origin/master");
987 * otherwise "git push $URL master" would result in
988 * ambiguity between remotes/origin/master and heads/master
989 * at the remote site.
991 if (namelen
!= patlen
&&
992 patlen
!= namelen
- 5 &&
993 prefixcmp(name
, "refs/heads/") &&
994 prefixcmp(name
, "refs/tags/")) {
995 /* We want to catch the case where only weak
996 * matches are found and there are multiple
997 * matches, and where more than one strong
998 * matches are found, as ambiguous. One
999 * strong match with zero or more weak matches
1000 * are acceptable as a unique match.
1002 matched_weak
= refs
;
1011 *matched_ref
= matched_weak
;
1015 *matched_ref
= matched
;
1020 static void tail_link_ref(struct ref
*ref
, struct ref
***tail
)
1028 static struct ref
*alloc_delete_ref(void)
1030 struct ref
*ref
= alloc_ref("(delete)");
1031 hashclr(ref
->new_sha1
);
1035 static struct ref
*try_explicit_object_name(const char *name
)
1037 unsigned char sha1
[20];
1041 return alloc_delete_ref();
1042 if (get_sha1(name
, sha1
))
1044 ref
= alloc_ref(name
);
1045 hashcpy(ref
->new_sha1
, sha1
);
1049 static struct ref
*make_linked_ref(const char *name
, struct ref
***tail
)
1051 struct ref
*ret
= alloc_ref(name
);
1052 tail_link_ref(ret
, tail
);
1056 static char *guess_ref(const char *name
, struct ref
*peer
)
1058 struct strbuf buf
= STRBUF_INIT
;
1059 unsigned char sha1
[20];
1061 const char *r
= resolve_ref_unsafe(peer
->name
, sha1
, 1, NULL
);
1065 if (!prefixcmp(r
, "refs/heads/"))
1066 strbuf_addstr(&buf
, "refs/heads/");
1067 else if (!prefixcmp(r
, "refs/tags/"))
1068 strbuf_addstr(&buf
, "refs/tags/");
1072 strbuf_addstr(&buf
, name
);
1073 return strbuf_detach(&buf
, NULL
);
1076 static int match_explicit(struct ref
*src
, struct ref
*dst
,
1077 struct ref
***dst_tail
,
1080 struct ref
*matched_src
, *matched_dst
;
1083 const char *dst_value
= rs
->dst
;
1086 if (rs
->pattern
|| rs
->matching
)
1089 matched_src
= matched_dst
= NULL
;
1090 switch (count_refspec_match(rs
->src
, src
, &matched_src
)) {
1095 /* The source could be in the get_sha1() format
1096 * not a reference name. :refs/other is a
1097 * way to delete 'other' ref at the remote end.
1099 matched_src
= try_explicit_object_name(rs
->src
);
1101 return error("src refspec %s does not match any.", rs
->src
);
1105 return error("src refspec %s matches more than one.", rs
->src
);
1109 unsigned char sha1
[20];
1112 dst_value
= resolve_ref_unsafe(matched_src
->name
, sha1
, 1, &flag
);
1114 ((flag
& REF_ISSYMREF
) &&
1115 prefixcmp(dst_value
, "refs/heads/")))
1116 die("%s cannot be resolved to branch.",
1120 switch (count_refspec_match(dst_value
, dst
, &matched_dst
)) {
1124 if (!memcmp(dst_value
, "refs/", 5))
1125 matched_dst
= make_linked_ref(dst_value
, dst_tail
);
1126 else if (is_null_sha1(matched_src
->new_sha1
))
1127 error("unable to delete '%s': remote ref does not exist",
1129 else if ((dst_guess
= guess_ref(dst_value
, matched_src
)))
1130 matched_dst
= make_linked_ref(dst_guess
, dst_tail
);
1132 error("unable to push to unqualified destination: %s\n"
1133 "The destination refspec neither matches an "
1134 "existing ref on the remote nor\n"
1135 "begins with refs/, and we are unable to "
1136 "guess a prefix based on the source ref.",
1141 error("dst refspec %s matches more than one.",
1147 if (matched_dst
->peer_ref
)
1148 return error("dst ref %s receives from more than one src.",
1151 matched_dst
->peer_ref
= copy_src
? copy_ref(matched_src
) : matched_src
;
1152 matched_dst
->force
= rs
->force
;
1157 static int match_explicit_refs(struct ref
*src
, struct ref
*dst
,
1158 struct ref
***dst_tail
, struct refspec
*rs
,
1162 for (i
= errs
= 0; i
< rs_nr
; i
++)
1163 errs
+= match_explicit(src
, dst
, dst_tail
, &rs
[i
]);
1167 static char *get_ref_match(const struct refspec
*rs
, int rs_nr
, const struct ref
*ref
,
1168 int send_mirror
, int direction
, const struct refspec
**ret_pat
)
1170 const struct refspec
*pat
;
1173 int matching_refs
= -1;
1174 for (i
= 0; i
< rs_nr
; i
++) {
1175 if (rs
[i
].matching
&&
1176 (matching_refs
== -1 || rs
[i
].force
)) {
1181 if (rs
[i
].pattern
) {
1182 const char *dst_side
= rs
[i
].dst
? rs
[i
].dst
: rs
[i
].src
;
1184 if (direction
== FROM_SRC
)
1185 match
= match_name_with_pattern(rs
[i
].src
, ref
->name
, dst_side
, &name
);
1187 match
= match_name_with_pattern(dst_side
, ref
->name
, rs
[i
].src
, &name
);
1194 if (matching_refs
== -1)
1197 pat
= rs
+ matching_refs
;
1198 if (pat
->matching
) {
1200 * "matching refs"; traditionally we pushed everything
1201 * including refs outside refs/heads/ hierarchy, but
1202 * that does not make much sense these days.
1204 if (!send_mirror
&& prefixcmp(ref
->name
, "refs/heads/"))
1206 name
= xstrdup(ref
->name
);
1213 static struct ref
**tail_ref(struct ref
**head
)
1215 struct ref
**tail
= head
;
1217 tail
= &((*tail
)->next
);
1222 struct commit
**tip
;
1226 static void add_to_tips(struct tips
*tips
, const unsigned char *sha1
)
1228 struct commit
*commit
;
1230 if (is_null_sha1(sha1
))
1232 commit
= lookup_commit_reference_gently(sha1
, 1);
1233 if (!commit
|| (commit
->object
.flags
& TMP_MARK
))
1235 commit
->object
.flags
|= TMP_MARK
;
1236 ALLOC_GROW(tips
->tip
, tips
->nr
+ 1, tips
->alloc
);
1237 tips
->tip
[tips
->nr
++] = commit
;
1240 static void add_missing_tags(struct ref
*src
, struct ref
**dst
, struct ref
***dst_tail
)
1242 struct string_list dst_tag
= STRING_LIST_INIT_NODUP
;
1243 struct string_list src_tag
= STRING_LIST_INIT_NODUP
;
1244 struct string_list_item
*item
;
1246 struct tips sent_tips
;
1249 * Collect everything we know they would have at the end of
1250 * this push, and collect all tags they have.
1252 memset(&sent_tips
, 0, sizeof(sent_tips
));
1253 for (ref
= *dst
; ref
; ref
= ref
->next
) {
1254 if (ref
->peer_ref
&&
1255 !is_null_sha1(ref
->peer_ref
->new_sha1
))
1256 add_to_tips(&sent_tips
, ref
->peer_ref
->new_sha1
);
1258 add_to_tips(&sent_tips
, ref
->old_sha1
);
1259 if (!prefixcmp(ref
->name
, "refs/tags/"))
1260 string_list_append(&dst_tag
, ref
->name
);
1262 clear_commit_marks_many(sent_tips
.nr
, sent_tips
.tip
, TMP_MARK
);
1264 sort_string_list(&dst_tag
);
1266 /* Collect tags they do not have. */
1267 for (ref
= src
; ref
; ref
= ref
->next
) {
1268 if (prefixcmp(ref
->name
, "refs/tags/"))
1269 continue; /* not a tag */
1270 if (string_list_has_string(&dst_tag
, ref
->name
))
1271 continue; /* they already have it */
1272 if (sha1_object_info(ref
->new_sha1
, NULL
) != OBJ_TAG
)
1273 continue; /* be conservative */
1274 item
= string_list_append(&src_tag
, ref
->name
);
1277 string_list_clear(&dst_tag
, 0);
1280 * At this point, src_tag lists tags that are missing from
1281 * dst, and sent_tips lists the tips we are pushing or those
1282 * that we know they already have. An element in the src_tag
1283 * that is an ancestor of any of the sent_tips needs to be
1284 * sent to the other side.
1287 for_each_string_list_item(item
, &src_tag
) {
1288 struct ref
*ref
= item
->util
;
1289 struct ref
*dst_ref
;
1290 struct commit
*commit
;
1292 if (is_null_sha1(ref
->new_sha1
))
1294 commit
= lookup_commit_reference_gently(ref
->new_sha1
, 1);
1296 /* not pushing a commit, which is not an error */
1300 * Is this tag, which they do not have, reachable from
1301 * any of the commits we are sending?
1303 if (!in_merge_bases_many(commit
, sent_tips
.nr
, sent_tips
.tip
))
1307 dst_ref
= make_linked_ref(ref
->name
, dst_tail
);
1308 hashcpy(dst_ref
->new_sha1
, ref
->new_sha1
);
1309 dst_ref
->peer_ref
= copy_ref(ref
);
1312 string_list_clear(&src_tag
, 0);
1313 free(sent_tips
.tip
);
1317 * Given the set of refs the local repository has, the set of refs the
1318 * remote repository has, and the refspec used for push, determine
1319 * what remote refs we will update and with what value by setting
1320 * peer_ref (which object is being pushed) and force (if the push is
1321 * forced) in elements of "dst". The function may add new elements to
1322 * dst (e.g. pushing to a new branch, done in match_explicit_refs).
1324 int match_push_refs(struct ref
*src
, struct ref
**dst
,
1325 int nr_refspec
, const char **refspec
, int flags
)
1328 int send_all
= flags
& MATCH_REFS_ALL
;
1329 int send_mirror
= flags
& MATCH_REFS_MIRROR
;
1330 int send_prune
= flags
& MATCH_REFS_PRUNE
;
1332 static const char *default_refspec
[] = { ":", NULL
};
1333 struct ref
*ref
, **dst_tail
= tail_ref(dst
);
1337 refspec
= default_refspec
;
1339 rs
= parse_push_refspec(nr_refspec
, (const char **) refspec
);
1340 errs
= match_explicit_refs(src
, *dst
, &dst_tail
, rs
, nr_refspec
);
1342 /* pick the remainder */
1343 for (ref
= src
; ref
; ref
= ref
->next
) {
1344 struct ref
*dst_peer
;
1345 const struct refspec
*pat
= NULL
;
1348 dst_name
= get_ref_match(rs
, nr_refspec
, ref
, send_mirror
, FROM_SRC
, &pat
);
1352 dst_peer
= find_ref_by_name(*dst
, dst_name
);
1354 if (dst_peer
->peer_ref
)
1355 /* We're already sending something to this ref. */
1358 if (pat
->matching
&& !(send_all
|| send_mirror
))
1360 * Remote doesn't have it, and we have no
1361 * explicit pattern, and we don't have
1362 * --all nor --mirror.
1366 /* Create a new one and link it */
1367 dst_peer
= make_linked_ref(dst_name
, &dst_tail
);
1368 hashcpy(dst_peer
->new_sha1
, ref
->new_sha1
);
1370 dst_peer
->peer_ref
= copy_ref(ref
);
1371 dst_peer
->force
= pat
->force
;
1376 if (flags
& MATCH_REFS_FOLLOW_TAGS
)
1377 add_missing_tags(src
, dst
, &dst_tail
);
1380 /* check for missing refs on the remote */
1381 for (ref
= *dst
; ref
; ref
= ref
->next
) {
1385 /* We're already sending something to this ref. */
1388 src_name
= get_ref_match(rs
, nr_refspec
, ref
, send_mirror
, FROM_DST
, NULL
);
1390 if (!find_ref_by_name(src
, src_name
))
1391 ref
->peer_ref
= alloc_delete_ref();
1401 void set_ref_status_for_push(struct ref
*remote_refs
, int send_mirror
,
1406 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
1407 int force_ref_update
= ref
->force
|| force_update
;
1410 hashcpy(ref
->new_sha1
, ref
->peer_ref
->new_sha1
);
1411 else if (!send_mirror
)
1414 ref
->deletion
= is_null_sha1(ref
->new_sha1
);
1415 if (!ref
->deletion
&&
1416 !hashcmp(ref
->old_sha1
, ref
->new_sha1
)) {
1417 ref
->status
= REF_STATUS_UPTODATE
;
1422 * Decide whether an individual refspec A:B can be
1423 * pushed. The push will succeed if any of the
1424 * following are true:
1426 * (1) the remote reference B does not exist
1428 * (2) the remote reference B is being removed (i.e.,
1429 * pushing :B where no source is specified)
1431 * (3) the destination is not under refs/tags/, and
1432 * if the old and new value is a commit, the new
1433 * is a descendant of the old.
1435 * (4) it is forced using the +A:B notation, or by
1436 * passing the --force argument
1439 if (!ref
->deletion
&& !is_null_sha1(ref
->old_sha1
)) {
1440 int why
= 0; /* why would this push require --force? */
1442 if (!prefixcmp(ref
->name
, "refs/tags/"))
1443 why
= REF_STATUS_REJECT_ALREADY_EXISTS
;
1444 else if (!has_sha1_file(ref
->old_sha1
))
1445 why
= REF_STATUS_REJECT_FETCH_FIRST
;
1446 else if (!lookup_commit_reference_gently(ref
->old_sha1
, 1) ||
1447 !lookup_commit_reference_gently(ref
->new_sha1
, 1))
1448 why
= REF_STATUS_REJECT_NEEDS_FORCE
;
1449 else if (!ref_newer(ref
->new_sha1
, ref
->old_sha1
))
1450 why
= REF_STATUS_REJECT_NONFASTFORWARD
;
1452 if (!force_ref_update
)
1455 ref
->forced_update
= 1;
1460 struct branch
*branch_get(const char *name
)
1465 if (!name
|| !*name
|| !strcmp(name
, "HEAD"))
1466 ret
= current_branch
;
1468 ret
= make_branch(name
, 0);
1469 if (ret
&& ret
->remote_name
) {
1470 ret
->remote
= remote_get(ret
->remote_name
);
1471 if (ret
->merge_nr
) {
1473 ret
->merge
= xcalloc(sizeof(*ret
->merge
),
1475 for (i
= 0; i
< ret
->merge_nr
; i
++) {
1476 ret
->merge
[i
] = xcalloc(1, sizeof(**ret
->merge
));
1477 ret
->merge
[i
]->src
= xstrdup(ret
->merge_name
[i
]);
1478 if (remote_find_tracking(ret
->remote
, ret
->merge
[i
])
1479 && !strcmp(ret
->remote_name
, "."))
1480 ret
->merge
[i
]->dst
= xstrdup(ret
->merge_name
[i
]);
1487 int branch_has_merge_config(struct branch
*branch
)
1489 return branch
&& !!branch
->merge
;
1492 int branch_merge_matches(struct branch
*branch
,
1494 const char *refname
)
1496 if (!branch
|| i
< 0 || i
>= branch
->merge_nr
)
1498 return refname_match(branch
->merge
[i
]->src
, refname
, ref_fetch_rules
);
1501 static int ignore_symref_update(const char *refname
)
1503 unsigned char sha1
[20];
1506 if (!resolve_ref_unsafe(refname
, sha1
, 0, &flag
))
1507 return 0; /* non-existing refs are OK */
1508 return (flag
& REF_ISSYMREF
);
1511 static struct ref
*get_expanded_map(const struct ref
*remote_refs
,
1512 const struct refspec
*refspec
)
1514 const struct ref
*ref
;
1515 struct ref
*ret
= NULL
;
1516 struct ref
**tail
= &ret
;
1520 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
1521 if (strchr(ref
->name
, '^'))
1522 continue; /* a dereference item */
1523 if (match_name_with_pattern(refspec
->src
, ref
->name
,
1524 refspec
->dst
, &expn_name
) &&
1525 !ignore_symref_update(expn_name
)) {
1526 struct ref
*cpy
= copy_ref(ref
);
1528 cpy
->peer_ref
= alloc_ref(expn_name
);
1531 cpy
->peer_ref
->force
= 1;
1540 static const struct ref
*find_ref_by_name_abbrev(const struct ref
*refs
, const char *name
)
1542 const struct ref
*ref
;
1543 for (ref
= refs
; ref
; ref
= ref
->next
) {
1544 if (refname_match(name
, ref
->name
, ref_fetch_rules
))
1550 struct ref
*get_remote_ref(const struct ref
*remote_refs
, const char *name
)
1552 const struct ref
*ref
= find_ref_by_name_abbrev(remote_refs
, name
);
1557 return copy_ref(ref
);
1560 static struct ref
*get_local_ref(const char *name
)
1562 if (!name
|| name
[0] == '\0')
1565 if (!prefixcmp(name
, "refs/"))
1566 return alloc_ref(name
);
1568 if (!prefixcmp(name
, "heads/") ||
1569 !prefixcmp(name
, "tags/") ||
1570 !prefixcmp(name
, "remotes/"))
1571 return alloc_ref_with_prefix("refs/", 5, name
);
1573 return alloc_ref_with_prefix("refs/heads/", 11, name
);
1576 int get_fetch_map(const struct ref
*remote_refs
,
1577 const struct refspec
*refspec
,
1581 struct ref
*ref_map
, **rmp
;
1583 if (refspec
->pattern
) {
1584 ref_map
= get_expanded_map(remote_refs
, refspec
);
1586 const char *name
= refspec
->src
[0] ? refspec
->src
: "HEAD";
1588 if (refspec
->exact_sha1
) {
1589 ref_map
= alloc_ref(name
);
1590 get_sha1_hex(name
, ref_map
->old_sha1
);
1592 ref_map
= get_remote_ref(remote_refs
, name
);
1594 if (!missing_ok
&& !ref_map
)
1595 die("Couldn't find remote ref %s", name
);
1597 ref_map
->peer_ref
= get_local_ref(refspec
->dst
);
1598 if (ref_map
->peer_ref
&& refspec
->force
)
1599 ref_map
->peer_ref
->force
= 1;
1603 for (rmp
= &ref_map
; *rmp
; ) {
1604 if ((*rmp
)->peer_ref
) {
1605 if (prefixcmp((*rmp
)->peer_ref
->name
, "refs/") ||
1606 check_refname_format((*rmp
)->peer_ref
->name
, 0)) {
1607 struct ref
*ignore
= *rmp
;
1608 error("* Ignoring funny ref '%s' locally",
1609 (*rmp
)->peer_ref
->name
);
1610 *rmp
= (*rmp
)->next
;
1611 free(ignore
->peer_ref
);
1616 rmp
= &((*rmp
)->next
);
1620 tail_link_ref(ref_map
, tail
);
1625 int resolve_remote_symref(struct ref
*ref
, struct ref
*list
)
1629 for (; list
; list
= list
->next
)
1630 if (!strcmp(ref
->symref
, list
->name
)) {
1631 hashcpy(ref
->old_sha1
, list
->old_sha1
);
1637 static void unmark_and_free(struct commit_list
*list
, unsigned int mark
)
1640 struct commit_list
*temp
= list
;
1641 temp
->item
->object
.flags
&= ~mark
;
1647 int ref_newer(const unsigned char *new_sha1
, const unsigned char *old_sha1
)
1650 struct commit
*old
, *new;
1651 struct commit_list
*list
, *used
;
1655 * Both new and old must be commit-ish and new is descendant of
1656 * old. Otherwise we require --force.
1658 o
= deref_tag(parse_object(old_sha1
), NULL
, 0);
1659 if (!o
|| o
->type
!= OBJ_COMMIT
)
1661 old
= (struct commit
*) o
;
1663 o
= deref_tag(parse_object(new_sha1
), NULL
, 0);
1664 if (!o
|| o
->type
!= OBJ_COMMIT
)
1666 new = (struct commit
*) o
;
1668 if (parse_commit(new) < 0)
1672 commit_list_insert(new, &list
);
1674 new = pop_most_recent_commit(&list
, TMP_MARK
);
1675 commit_list_insert(new, &used
);
1681 unmark_and_free(list
, TMP_MARK
);
1682 unmark_and_free(used
, TMP_MARK
);
1687 * Return true if there is anything to report, otherwise false.
1689 int stat_tracking_info(struct branch
*branch
, int *num_ours
, int *num_theirs
)
1691 unsigned char sha1
[20];
1692 struct commit
*ours
, *theirs
;
1694 struct rev_info revs
;
1695 const char *rev_argv
[10], *base
;
1699 * Nothing to report unless we are marked to build on top of
1703 !branch
->merge
|| !branch
->merge
[0] || !branch
->merge
[0]->dst
)
1707 * If what we used to build on no longer exists, there is
1708 * nothing to report.
1710 base
= branch
->merge
[0]->dst
;
1711 if (read_ref(base
, sha1
))
1713 theirs
= lookup_commit_reference(sha1
);
1717 if (read_ref(branch
->refname
, sha1
))
1719 ours
= lookup_commit_reference(sha1
);
1723 /* are we the same? */
1727 /* Run "rev-list --left-right ours...theirs" internally... */
1729 rev_argv
[rev_argc
++] = NULL
;
1730 rev_argv
[rev_argc
++] = "--left-right";
1731 rev_argv
[rev_argc
++] = symmetric
;
1732 rev_argv
[rev_argc
++] = "--";
1733 rev_argv
[rev_argc
] = NULL
;
1735 strcpy(symmetric
, sha1_to_hex(ours
->object
.sha1
));
1736 strcpy(symmetric
+ 40, "...");
1737 strcpy(symmetric
+ 43, sha1_to_hex(theirs
->object
.sha1
));
1739 init_revisions(&revs
, NULL
);
1740 setup_revisions(rev_argc
, rev_argv
, &revs
, NULL
);
1741 prepare_revision_walk(&revs
);
1743 /* ... and count the commits on each side. */
1747 struct commit
*c
= get_revision(&revs
);
1750 if (c
->object
.flags
& SYMMETRIC_LEFT
)
1756 /* clear object flags smudged by the above traversal */
1757 clear_commit_marks(ours
, ALL_REV_FLAGS
);
1758 clear_commit_marks(theirs
, ALL_REV_FLAGS
);
1763 * Return true when there is anything to report, otherwise false.
1765 int format_tracking_info(struct branch
*branch
, struct strbuf
*sb
)
1767 int num_ours
, num_theirs
;
1770 if (!stat_tracking_info(branch
, &num_ours
, &num_theirs
))
1773 base
= branch
->merge
[0]->dst
;
1774 base
= shorten_unambiguous_ref(base
, 0);
1777 Q_("Your branch is ahead of '%s' by %d commit.\n",
1778 "Your branch is ahead of '%s' by %d commits.\n",
1781 if (advice_status_hints
)
1783 _(" (use \"git push\" to publish your local commits)\n"));
1784 } else if (!num_ours
) {
1786 Q_("Your branch is behind '%s' by %d commit, "
1787 "and can be fast-forwarded.\n",
1788 "Your branch is behind '%s' by %d commits, "
1789 "and can be fast-forwarded.\n",
1792 if (advice_status_hints
)
1794 _(" (use \"git pull\" to update your local branch)\n"));
1797 Q_("Your branch and '%s' have diverged,\n"
1798 "and have %d and %d different commit each, "
1800 "Your branch and '%s' have diverged,\n"
1801 "and have %d and %d different commits each, "
1804 base
, num_ours
, num_theirs
);
1805 if (advice_status_hints
)
1807 _(" (use \"git pull\" to merge the remote branch into yours)\n"));
1812 static int one_local_ref(const char *refname
, const unsigned char *sha1
, int flag
, void *cb_data
)
1814 struct ref
***local_tail
= cb_data
;
1818 /* we already know it starts with refs/ to get here */
1819 if (check_refname_format(refname
+ 5, 0))
1822 len
= strlen(refname
) + 1;
1823 ref
= xcalloc(1, sizeof(*ref
) + len
);
1824 hashcpy(ref
->new_sha1
, sha1
);
1825 memcpy(ref
->name
, refname
, len
);
1827 *local_tail
= &ref
->next
;
1831 struct ref
*get_local_heads(void)
1833 struct ref
*local_refs
= NULL
, **local_tail
= &local_refs
;
1834 for_each_ref(one_local_ref
, &local_tail
);
1838 struct ref
*guess_remote_head(const struct ref
*head
,
1839 const struct ref
*refs
,
1842 const struct ref
*r
;
1843 struct ref
*list
= NULL
;
1844 struct ref
**tail
= &list
;
1850 * Some transports support directly peeking at
1851 * where HEAD points; if that is the case, then
1852 * we don't have to guess.
1855 return copy_ref(find_ref_by_name(refs
, head
->symref
));
1857 /* If refs/heads/master could be right, it is. */
1859 r
= find_ref_by_name(refs
, "refs/heads/master");
1860 if (r
&& !hashcmp(r
->old_sha1
, head
->old_sha1
))
1864 /* Look for another ref that points there */
1865 for (r
= refs
; r
; r
= r
->next
) {
1867 !prefixcmp(r
->name
, "refs/heads/") &&
1868 !hashcmp(r
->old_sha1
, head
->old_sha1
)) {
1869 *tail
= copy_ref(r
);
1870 tail
= &((*tail
)->next
);
1879 struct stale_heads_info
{
1880 struct string_list
*ref_names
;
1881 struct ref
**stale_refs_tail
;
1882 struct refspec
*refs
;
1886 static int get_stale_heads_cb(const char *refname
,
1887 const unsigned char *sha1
, int flags
, void *cb_data
)
1889 struct stale_heads_info
*info
= cb_data
;
1890 struct refspec query
;
1891 memset(&query
, 0, sizeof(struct refspec
));
1892 query
.dst
= (char *)refname
;
1894 if (query_refspecs(info
->refs
, info
->ref_count
, &query
))
1895 return 0; /* No matches */
1898 * If we did find a suitable refspec and it's not a symref and
1899 * it's not in the list of refs that currently exist in that
1900 * remote we consider it to be stale.
1902 if (!((flags
& REF_ISSYMREF
) ||
1903 string_list_has_string(info
->ref_names
, query
.src
))) {
1904 struct ref
*ref
= make_linked_ref(refname
, &info
->stale_refs_tail
);
1905 hashcpy(ref
->new_sha1
, sha1
);
1912 struct ref
*get_stale_heads(struct refspec
*refs
, int ref_count
, struct ref
*fetch_map
)
1914 struct ref
*ref
, *stale_refs
= NULL
;
1915 struct string_list ref_names
= STRING_LIST_INIT_NODUP
;
1916 struct stale_heads_info info
;
1917 info
.ref_names
= &ref_names
;
1918 info
.stale_refs_tail
= &stale_refs
;
1920 info
.ref_count
= ref_count
;
1921 for (ref
= fetch_map
; ref
; ref
= ref
->next
)
1922 string_list_append(&ref_names
, ref
->name
);
1923 sort_string_list(&ref_names
);
1924 for_each_ref(get_stale_heads_cb
, &info
);
1925 string_list_clear(&ref_names
, 0);