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
, ".pushremote")) {
368 if (branch
== current_branch
)
369 if (git_config_string(&pushremote_name
, key
, value
))
371 } else if (!strcmp(subkey
, ".merge")) {
373 return config_error_nonbool(key
);
374 add_merge(branch
, xstrdup(value
));
378 if (!prefixcmp(key
, "url.")) {
379 struct rewrite
*rewrite
;
381 subkey
= strrchr(name
, '.');
384 if (!strcmp(subkey
, ".insteadof")) {
385 rewrite
= make_rewrite(&rewrites
, name
, subkey
- name
);
387 return config_error_nonbool(key
);
388 add_instead_of(rewrite
, xstrdup(value
));
389 } else if (!strcmp(subkey
, ".pushinsteadof")) {
390 rewrite
= make_rewrite(&rewrites_push
, name
, subkey
- name
);
392 return config_error_nonbool(key
);
393 add_instead_of(rewrite
, xstrdup(value
));
397 if (prefixcmp(key
, "remote."))
401 /* Handle remote.* variables */
402 if (!strcmp(name
, "pushdefault"))
403 return git_config_string(&pushremote_name
, key
, value
);
405 /* Handle remote.<name>.* variables */
407 warning("Config remote shorthand cannot begin with '/': %s",
411 subkey
= strrchr(name
, '.');
414 remote
= make_remote(name
, subkey
- name
);
415 remote
->origin
= REMOTE_CONFIG
;
416 if (!strcmp(subkey
, ".mirror"))
417 remote
->mirror
= git_config_bool(key
, value
);
418 else if (!strcmp(subkey
, ".skipdefaultupdate"))
419 remote
->skip_default_update
= git_config_bool(key
, value
);
420 else if (!strcmp(subkey
, ".skipfetchall"))
421 remote
->skip_default_update
= git_config_bool(key
, value
);
422 else if (!strcmp(subkey
, ".url")) {
424 if (git_config_string(&v
, key
, value
))
427 } else if (!strcmp(subkey
, ".pushurl")) {
429 if (git_config_string(&v
, key
, value
))
431 add_pushurl(remote
, v
);
432 } else if (!strcmp(subkey
, ".push")) {
434 if (git_config_string(&v
, key
, value
))
436 add_push_refspec(remote
, v
);
437 } else if (!strcmp(subkey
, ".fetch")) {
439 if (git_config_string(&v
, key
, value
))
441 add_fetch_refspec(remote
, v
);
442 } else if (!strcmp(subkey
, ".receivepack")) {
444 if (git_config_string(&v
, key
, value
))
446 if (!remote
->receivepack
)
447 remote
->receivepack
= v
;
449 error("more than one receivepack given, using the first");
450 } else if (!strcmp(subkey
, ".uploadpack")) {
452 if (git_config_string(&v
, key
, value
))
454 if (!remote
->uploadpack
)
455 remote
->uploadpack
= v
;
457 error("more than one uploadpack given, using the first");
458 } else if (!strcmp(subkey
, ".tagopt")) {
459 if (!strcmp(value
, "--no-tags"))
460 remote
->fetch_tags
= -1;
461 else if (!strcmp(value
, "--tags"))
462 remote
->fetch_tags
= 2;
463 } else if (!strcmp(subkey
, ".proxy")) {
464 return git_config_string((const char **)&remote
->http_proxy
,
466 } else if (!strcmp(subkey
, ".vcs")) {
467 return git_config_string(&remote
->foreign_vcs
, key
, value
);
472 static void alias_all_urls(void)
475 for (i
= 0; i
< remotes_nr
; i
++) {
476 int add_pushurl_aliases
;
479 for (j
= 0; j
< remotes
[i
]->pushurl_nr
; j
++) {
480 remotes
[i
]->pushurl
[j
] = alias_url(remotes
[i
]->pushurl
[j
], &rewrites
);
482 add_pushurl_aliases
= remotes
[i
]->pushurl_nr
== 0;
483 for (j
= 0; j
< remotes
[i
]->url_nr
; j
++) {
484 if (add_pushurl_aliases
)
485 add_pushurl_alias(remotes
[i
], remotes
[i
]->url
[j
]);
486 remotes
[i
]->url
[j
] = alias_url(remotes
[i
]->url
[j
], &rewrites
);
491 static void read_config(void)
493 unsigned char sha1
[20];
494 const char *head_ref
;
496 if (default_remote_name
) /* did this already */
498 default_remote_name
= xstrdup("origin");
499 current_branch
= NULL
;
500 head_ref
= resolve_ref_unsafe("HEAD", sha1
, 0, &flag
);
501 if (head_ref
&& (flag
& REF_ISSYMREF
) &&
502 !prefixcmp(head_ref
, "refs/heads/")) {
504 make_branch(head_ref
+ strlen("refs/heads/"), 0);
506 git_config(handle_config
, NULL
);
511 * This function frees a refspec array.
512 * Warning: code paths should be checked to ensure that the src
513 * and dst pointers are always freeable pointers as well
514 * as the refspec pointer itself.
516 static void free_refspecs(struct refspec
*refspec
, int nr_refspec
)
523 for (i
= 0; i
< nr_refspec
; i
++) {
524 free(refspec
[i
].src
);
525 free(refspec
[i
].dst
);
530 static struct refspec
*parse_refspec_internal(int nr_refspec
, const char **refspec
, int fetch
, int verify
)
533 struct refspec
*rs
= xcalloc(sizeof(*rs
), nr_refspec
);
535 for (i
= 0; i
< nr_refspec
; i
++) {
538 const char *lhs
, *rhs
;
549 rhs
= strrchr(lhs
, ':');
552 * Before going on, special case ":" (or "+:") as a refspec
553 * for pushing matching refs.
555 if (!fetch
&& rhs
== lhs
&& rhs
[1] == '\0') {
561 size_t rlen
= strlen(++rhs
);
562 is_glob
= (1 <= rlen
&& strchr(rhs
, '*'));
563 rs
[i
].dst
= xstrndup(rhs
, rlen
);
566 llen
= (rhs
? (rhs
- lhs
- 1) : strlen(lhs
));
567 if (1 <= llen
&& memchr(lhs
, '*', llen
)) {
568 if ((rhs
&& !is_glob
) || (!rhs
&& fetch
))
571 } else if (rhs
&& is_glob
) {
575 rs
[i
].pattern
= is_glob
;
576 rs
[i
].src
= xstrndup(lhs
, llen
);
577 flags
= REFNAME_ALLOW_ONELEVEL
| (is_glob
? REFNAME_REFSPEC_PATTERN
: 0);
580 unsigned char unused
[40];
584 ; /* empty is ok; it means "HEAD" */
585 else if (llen
== 40 && !get_sha1_hex(rs
[i
].src
, unused
))
586 rs
[i
].exact_sha1
= 1; /* ok */
587 else if (!check_refname_format(rs
[i
].src
, flags
))
588 ; /* valid looking ref is ok */
593 ; /* missing is ok; it is the same as empty */
594 else if (!*rs
[i
].dst
)
595 ; /* empty is ok; it means "do not store" */
596 else if (!check_refname_format(rs
[i
].dst
, flags
))
597 ; /* valid looking ref is ok */
603 * - empty is allowed; it means delete.
604 * - when wildcarded, it must be a valid looking ref.
605 * - otherwise, it must be an extended SHA-1, but
606 * there is no existing way to validate this.
611 if (check_refname_format(rs
[i
].src
, flags
))
615 ; /* anything goes, for now */
618 * - missing is allowed, but LHS then must be a
620 * - empty is not allowed.
621 * - otherwise it must be a valid looking ref.
624 if (check_refname_format(rs
[i
].src
, flags
))
626 } else if (!*rs
[i
].dst
) {
629 if (check_refname_format(rs
[i
].dst
, flags
))
639 * nr_refspec must be greater than zero and i must be valid
640 * since it is only possible to reach this point from within
641 * the for loop above.
643 free_refspecs(rs
, i
+1);
646 die("Invalid refspec '%s'", refspec
[i
]);
649 int valid_fetch_refspec(const char *fetch_refspec_str
)
651 struct refspec
*refspec
;
653 refspec
= parse_refspec_internal(1, &fetch_refspec_str
, 1, 1);
654 free_refspecs(refspec
, 1);
658 struct refspec
*parse_fetch_refspec(int nr_refspec
, const char **refspec
)
660 return parse_refspec_internal(nr_refspec
, refspec
, 1, 0);
663 static struct refspec
*parse_push_refspec(int nr_refspec
, const char **refspec
)
665 return parse_refspec_internal(nr_refspec
, refspec
, 0, 0);
668 void free_refspec(int nr_refspec
, struct refspec
*refspec
)
671 for (i
= 0; i
< nr_refspec
; i
++) {
672 free(refspec
[i
].src
);
673 free(refspec
[i
].dst
);
678 static int valid_remote_nick(const char *name
)
680 if (!name
[0] || is_dot_or_dotdot(name
))
682 return !strchr(name
, '/'); /* no slash */
685 static struct remote
*remote_get_1(const char *name
, const char *pushremote_name
)
693 if (pushremote_name
) {
694 name
= pushremote_name
;
697 name
= default_remote_name
;
698 name_given
= explicit_default_remote_name
;
702 ret
= make_remote(name
, 0);
703 if (valid_remote_nick(name
)) {
704 if (!valid_remote(ret
))
705 read_remotes_file(ret
);
706 if (!valid_remote(ret
))
707 read_branches_file(ret
);
709 if (name_given
&& !valid_remote(ret
))
710 add_url_alias(ret
, name
);
711 if (!valid_remote(ret
))
713 ret
->fetch
= parse_fetch_refspec(ret
->fetch_refspec_nr
, ret
->fetch_refspec
);
714 ret
->push
= parse_push_refspec(ret
->push_refspec_nr
, ret
->push_refspec
);
718 struct remote
*remote_get(const char *name
)
721 return remote_get_1(name
, NULL
);
724 struct remote
*pushremote_get(const char *name
)
727 return remote_get_1(name
, pushremote_name
);
730 int remote_is_configured(const char *name
)
735 for (i
= 0; i
< remotes_nr
; i
++)
736 if (!strcmp(name
, remotes
[i
]->name
))
741 int for_each_remote(each_remote_fn fn
, void *priv
)
745 for (i
= 0; i
< remotes_nr
&& !result
; i
++) {
746 struct remote
*r
= remotes
[i
];
750 r
->fetch
= parse_fetch_refspec(r
->fetch_refspec_nr
,
753 r
->push
= parse_push_refspec(r
->push_refspec_nr
,
755 result
= fn(r
, priv
);
760 void ref_remove_duplicates(struct ref
*ref_map
)
762 struct string_list refs
= STRING_LIST_INIT_NODUP
;
763 struct string_list_item
*item
= NULL
;
764 struct ref
*prev
= NULL
, *next
= NULL
;
765 for (; ref_map
; prev
= ref_map
, ref_map
= next
) {
766 next
= ref_map
->next
;
767 if (!ref_map
->peer_ref
)
770 item
= string_list_lookup(&refs
, ref_map
->peer_ref
->name
);
772 if (strcmp(((struct ref
*)item
->util
)->name
,
774 die("%s tracks both %s and %s",
775 ref_map
->peer_ref
->name
,
776 ((struct ref
*)item
->util
)->name
,
778 prev
->next
= ref_map
->next
;
779 free(ref_map
->peer_ref
);
781 ref_map
= prev
; /* skip this; we freed it */
785 item
= string_list_insert(&refs
, ref_map
->peer_ref
->name
);
786 item
->util
= ref_map
;
788 string_list_clear(&refs
, 0);
791 int remote_has_url(struct remote
*remote
, const char *url
)
794 for (i
= 0; i
< remote
->url_nr
; i
++) {
795 if (!strcmp(remote
->url
[i
], url
))
801 static int match_name_with_pattern(const char *key
, const char *name
,
802 const char *value
, char **result
)
804 const char *kstar
= strchr(key
, '*');
810 die("Key '%s' of pattern had no '*'", key
);
812 ksuffixlen
= strlen(kstar
+ 1);
813 namelen
= strlen(name
);
814 ret
= !strncmp(name
, key
, klen
) && namelen
>= klen
+ ksuffixlen
&&
815 !memcmp(name
+ namelen
- ksuffixlen
, kstar
+ 1, ksuffixlen
);
817 const char *vstar
= strchr(value
, '*');
821 die("Value '%s' of pattern has no '*'", value
);
822 vlen
= vstar
- value
;
823 vsuffixlen
= strlen(vstar
+ 1);
824 *result
= xmalloc(vlen
+ vsuffixlen
+
826 klen
- ksuffixlen
+ 1);
827 strncpy(*result
, value
, vlen
);
828 strncpy(*result
+ vlen
,
829 name
+ klen
, namelen
- klen
- ksuffixlen
);
830 strcpy(*result
+ vlen
+ namelen
- klen
- ksuffixlen
,
836 static int query_refspecs(struct refspec
*refs
, int ref_count
, struct refspec
*query
)
839 int find_src
= !query
->src
;
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
;
848 const char *needle
= find_src
? query
->dst
: query
->src
;
849 char **result
= find_src
? &query
->src
: &query
->dst
;
853 if (refspec
->pattern
) {
854 if (match_name_with_pattern(key
, needle
, value
, result
)) {
855 query
->force
= refspec
->force
;
858 } else if (!strcmp(needle
, key
)) {
859 *result
= xstrdup(value
);
860 query
->force
= refspec
->force
;
867 char *apply_refspecs(struct refspec
*refspecs
, int nr_refspec
,
870 struct refspec query
;
872 memset(&query
, 0, sizeof(struct refspec
));
873 query
.src
= (char *)name
;
875 if (query_refspecs(refspecs
, nr_refspec
, &query
))
881 int remote_find_tracking(struct remote
*remote
, struct refspec
*refspec
)
883 return query_refspecs(remote
->fetch
, remote
->fetch_refspec_nr
, refspec
);
886 static struct ref
*alloc_ref_with_prefix(const char *prefix
, size_t prefixlen
,
889 size_t len
= strlen(name
);
890 struct ref
*ref
= xcalloc(1, sizeof(struct ref
) + prefixlen
+ len
+ 1);
891 memcpy(ref
->name
, prefix
, prefixlen
);
892 memcpy(ref
->name
+ prefixlen
, name
, len
);
896 struct ref
*alloc_ref(const char *name
)
898 return alloc_ref_with_prefix("", 0, name
);
901 struct ref
*copy_ref(const struct ref
*ref
)
907 len
= strlen(ref
->name
);
908 cpy
= xmalloc(sizeof(struct ref
) + len
+ 1);
909 memcpy(cpy
, ref
, sizeof(struct ref
) + len
+ 1);
911 cpy
->symref
= ref
->symref
? xstrdup(ref
->symref
) : NULL
;
912 cpy
->remote_status
= ref
->remote_status
? xstrdup(ref
->remote_status
) : NULL
;
913 cpy
->peer_ref
= copy_ref(ref
->peer_ref
);
917 struct ref
*copy_ref_list(const struct ref
*ref
)
919 struct ref
*ret
= NULL
;
920 struct ref
**tail
= &ret
;
922 *tail
= copy_ref(ref
);
924 tail
= &((*tail
)->next
);
929 static void free_ref(struct ref
*ref
)
933 free_ref(ref
->peer_ref
);
934 free(ref
->remote_status
);
939 void free_refs(struct ref
*ref
)
949 int ref_compare_name(const void *va
, const void *vb
)
951 const struct ref
*a
= va
, *b
= vb
;
952 return strcmp(a
->name
, b
->name
);
955 static void *ref_list_get_next(const void *a
)
957 return ((const struct ref
*)a
)->next
;
960 static void ref_list_set_next(void *a
, void *next
)
962 ((struct ref
*)a
)->next
= next
;
965 void sort_ref_list(struct ref
**l
, int (*cmp
)(const void *, const void *))
967 *l
= llist_mergesort(*l
, ref_list_get_next
, ref_list_set_next
, cmp
);
970 static int count_refspec_match(const char *pattern
,
972 struct ref
**matched_ref
)
974 int patlen
= strlen(pattern
);
975 struct ref
*matched_weak
= NULL
;
976 struct ref
*matched
= NULL
;
980 for (weak_match
= match
= 0; refs
; refs
= refs
->next
) {
981 char *name
= refs
->name
;
982 int namelen
= strlen(name
);
984 if (!refname_match(pattern
, name
, ref_rev_parse_rules
))
987 /* A match is "weak" if it is with refs outside
988 * heads or tags, and did not specify the pattern
989 * in full (e.g. "refs/remotes/origin/master") or at
990 * least from the toplevel (e.g. "remotes/origin/master");
991 * otherwise "git push $URL master" would result in
992 * ambiguity between remotes/origin/master and heads/master
993 * at the remote site.
995 if (namelen
!= patlen
&&
996 patlen
!= namelen
- 5 &&
997 prefixcmp(name
, "refs/heads/") &&
998 prefixcmp(name
, "refs/tags/")) {
999 /* We want to catch the case where only weak
1000 * matches are found and there are multiple
1001 * matches, and where more than one strong
1002 * matches are found, as ambiguous. One
1003 * strong match with zero or more weak matches
1004 * are acceptable as a unique match.
1006 matched_weak
= refs
;
1015 *matched_ref
= matched_weak
;
1019 *matched_ref
= matched
;
1024 static void tail_link_ref(struct ref
*ref
, struct ref
***tail
)
1032 static struct ref
*alloc_delete_ref(void)
1034 struct ref
*ref
= alloc_ref("(delete)");
1035 hashclr(ref
->new_sha1
);
1039 static struct ref
*try_explicit_object_name(const char *name
)
1041 unsigned char sha1
[20];
1045 return alloc_delete_ref();
1046 if (get_sha1(name
, sha1
))
1048 ref
= alloc_ref(name
);
1049 hashcpy(ref
->new_sha1
, sha1
);
1053 static struct ref
*make_linked_ref(const char *name
, struct ref
***tail
)
1055 struct ref
*ret
= alloc_ref(name
);
1056 tail_link_ref(ret
, tail
);
1060 static char *guess_ref(const char *name
, struct ref
*peer
)
1062 struct strbuf buf
= STRBUF_INIT
;
1063 unsigned char sha1
[20];
1065 const char *r
= resolve_ref_unsafe(peer
->name
, sha1
, 1, NULL
);
1069 if (!prefixcmp(r
, "refs/heads/"))
1070 strbuf_addstr(&buf
, "refs/heads/");
1071 else if (!prefixcmp(r
, "refs/tags/"))
1072 strbuf_addstr(&buf
, "refs/tags/");
1076 strbuf_addstr(&buf
, name
);
1077 return strbuf_detach(&buf
, NULL
);
1080 static int match_explicit(struct ref
*src
, struct ref
*dst
,
1081 struct ref
***dst_tail
,
1084 struct ref
*matched_src
, *matched_dst
;
1087 const char *dst_value
= rs
->dst
;
1090 if (rs
->pattern
|| rs
->matching
)
1093 matched_src
= matched_dst
= NULL
;
1094 switch (count_refspec_match(rs
->src
, src
, &matched_src
)) {
1099 /* The source could be in the get_sha1() format
1100 * not a reference name. :refs/other is a
1101 * way to delete 'other' ref at the remote end.
1103 matched_src
= try_explicit_object_name(rs
->src
);
1105 return error("src refspec %s does not match any.", rs
->src
);
1109 return error("src refspec %s matches more than one.", rs
->src
);
1113 unsigned char sha1
[20];
1116 dst_value
= resolve_ref_unsafe(matched_src
->name
, sha1
, 1, &flag
);
1118 ((flag
& REF_ISSYMREF
) &&
1119 prefixcmp(dst_value
, "refs/heads/")))
1120 die("%s cannot be resolved to branch.",
1124 switch (count_refspec_match(dst_value
, dst
, &matched_dst
)) {
1128 if (!memcmp(dst_value
, "refs/", 5))
1129 matched_dst
= make_linked_ref(dst_value
, dst_tail
);
1130 else if (is_null_sha1(matched_src
->new_sha1
))
1131 error("unable to delete '%s': remote ref does not exist",
1133 else if ((dst_guess
= guess_ref(dst_value
, matched_src
)))
1134 matched_dst
= make_linked_ref(dst_guess
, dst_tail
);
1136 error("unable to push to unqualified destination: %s\n"
1137 "The destination refspec neither matches an "
1138 "existing ref on the remote nor\n"
1139 "begins with refs/, and we are unable to "
1140 "guess a prefix based on the source ref.",
1145 error("dst refspec %s matches more than one.",
1151 if (matched_dst
->peer_ref
)
1152 return error("dst ref %s receives from more than one src.",
1155 matched_dst
->peer_ref
= copy_src
? copy_ref(matched_src
) : matched_src
;
1156 matched_dst
->force
= rs
->force
;
1161 static int match_explicit_refs(struct ref
*src
, struct ref
*dst
,
1162 struct ref
***dst_tail
, struct refspec
*rs
,
1166 for (i
= errs
= 0; i
< rs_nr
; i
++)
1167 errs
+= match_explicit(src
, dst
, dst_tail
, &rs
[i
]);
1171 static char *get_ref_match(const struct refspec
*rs
, int rs_nr
, const struct ref
*ref
,
1172 int send_mirror
, int direction
, const struct refspec
**ret_pat
)
1174 const struct refspec
*pat
;
1177 int matching_refs
= -1;
1178 for (i
= 0; i
< rs_nr
; i
++) {
1179 if (rs
[i
].matching
&&
1180 (matching_refs
== -1 || rs
[i
].force
)) {
1185 if (rs
[i
].pattern
) {
1186 const char *dst_side
= rs
[i
].dst
? rs
[i
].dst
: rs
[i
].src
;
1188 if (direction
== FROM_SRC
)
1189 match
= match_name_with_pattern(rs
[i
].src
, ref
->name
, dst_side
, &name
);
1191 match
= match_name_with_pattern(dst_side
, ref
->name
, rs
[i
].src
, &name
);
1198 if (matching_refs
== -1)
1201 pat
= rs
+ matching_refs
;
1202 if (pat
->matching
) {
1204 * "matching refs"; traditionally we pushed everything
1205 * including refs outside refs/heads/ hierarchy, but
1206 * that does not make much sense these days.
1208 if (!send_mirror
&& prefixcmp(ref
->name
, "refs/heads/"))
1210 name
= xstrdup(ref
->name
);
1217 static struct ref
**tail_ref(struct ref
**head
)
1219 struct ref
**tail
= head
;
1221 tail
= &((*tail
)->next
);
1226 struct commit
**tip
;
1230 static void add_to_tips(struct tips
*tips
, const unsigned char *sha1
)
1232 struct commit
*commit
;
1234 if (is_null_sha1(sha1
))
1236 commit
= lookup_commit_reference_gently(sha1
, 1);
1237 if (!commit
|| (commit
->object
.flags
& TMP_MARK
))
1239 commit
->object
.flags
|= TMP_MARK
;
1240 ALLOC_GROW(tips
->tip
, tips
->nr
+ 1, tips
->alloc
);
1241 tips
->tip
[tips
->nr
++] = commit
;
1244 static void add_missing_tags(struct ref
*src
, struct ref
**dst
, struct ref
***dst_tail
)
1246 struct string_list dst_tag
= STRING_LIST_INIT_NODUP
;
1247 struct string_list src_tag
= STRING_LIST_INIT_NODUP
;
1248 struct string_list_item
*item
;
1250 struct tips sent_tips
;
1253 * Collect everything we know they would have at the end of
1254 * this push, and collect all tags they have.
1256 memset(&sent_tips
, 0, sizeof(sent_tips
));
1257 for (ref
= *dst
; ref
; ref
= ref
->next
) {
1258 if (ref
->peer_ref
&&
1259 !is_null_sha1(ref
->peer_ref
->new_sha1
))
1260 add_to_tips(&sent_tips
, ref
->peer_ref
->new_sha1
);
1262 add_to_tips(&sent_tips
, ref
->old_sha1
);
1263 if (!prefixcmp(ref
->name
, "refs/tags/"))
1264 string_list_append(&dst_tag
, ref
->name
);
1266 clear_commit_marks_many(sent_tips
.nr
, sent_tips
.tip
, TMP_MARK
);
1268 sort_string_list(&dst_tag
);
1270 /* Collect tags they do not have. */
1271 for (ref
= src
; ref
; ref
= ref
->next
) {
1272 if (prefixcmp(ref
->name
, "refs/tags/"))
1273 continue; /* not a tag */
1274 if (string_list_has_string(&dst_tag
, ref
->name
))
1275 continue; /* they already have it */
1276 if (sha1_object_info(ref
->new_sha1
, NULL
) != OBJ_TAG
)
1277 continue; /* be conservative */
1278 item
= string_list_append(&src_tag
, ref
->name
);
1281 string_list_clear(&dst_tag
, 0);
1284 * At this point, src_tag lists tags that are missing from
1285 * dst, and sent_tips lists the tips we are pushing or those
1286 * that we know they already have. An element in the src_tag
1287 * that is an ancestor of any of the sent_tips needs to be
1288 * sent to the other side.
1291 for_each_string_list_item(item
, &src_tag
) {
1292 struct ref
*ref
= item
->util
;
1293 struct ref
*dst_ref
;
1294 struct commit
*commit
;
1296 if (is_null_sha1(ref
->new_sha1
))
1298 commit
= lookup_commit_reference_gently(ref
->new_sha1
, 1);
1300 /* not pushing a commit, which is not an error */
1304 * Is this tag, which they do not have, reachable from
1305 * any of the commits we are sending?
1307 if (!in_merge_bases_many(commit
, sent_tips
.nr
, sent_tips
.tip
))
1311 dst_ref
= make_linked_ref(ref
->name
, dst_tail
);
1312 hashcpy(dst_ref
->new_sha1
, ref
->new_sha1
);
1313 dst_ref
->peer_ref
= copy_ref(ref
);
1316 string_list_clear(&src_tag
, 0);
1317 free(sent_tips
.tip
);
1321 * Given the set of refs the local repository has, the set of refs the
1322 * remote repository has, and the refspec used for push, determine
1323 * what remote refs we will update and with what value by setting
1324 * peer_ref (which object is being pushed) and force (if the push is
1325 * forced) in elements of "dst". The function may add new elements to
1326 * dst (e.g. pushing to a new branch, done in match_explicit_refs).
1328 int match_push_refs(struct ref
*src
, struct ref
**dst
,
1329 int nr_refspec
, const char **refspec
, int flags
)
1332 int send_all
= flags
& MATCH_REFS_ALL
;
1333 int send_mirror
= flags
& MATCH_REFS_MIRROR
;
1334 int send_prune
= flags
& MATCH_REFS_PRUNE
;
1336 static const char *default_refspec
[] = { ":", NULL
};
1337 struct ref
*ref
, **dst_tail
= tail_ref(dst
);
1341 refspec
= default_refspec
;
1343 rs
= parse_push_refspec(nr_refspec
, (const char **) refspec
);
1344 errs
= match_explicit_refs(src
, *dst
, &dst_tail
, rs
, nr_refspec
);
1346 /* pick the remainder */
1347 for (ref
= src
; ref
; ref
= ref
->next
) {
1348 struct ref
*dst_peer
;
1349 const struct refspec
*pat
= NULL
;
1352 dst_name
= get_ref_match(rs
, nr_refspec
, ref
, send_mirror
, FROM_SRC
, &pat
);
1356 dst_peer
= find_ref_by_name(*dst
, dst_name
);
1358 if (dst_peer
->peer_ref
)
1359 /* We're already sending something to this ref. */
1362 if (pat
->matching
&& !(send_all
|| send_mirror
))
1364 * Remote doesn't have it, and we have no
1365 * explicit pattern, and we don't have
1366 * --all nor --mirror.
1370 /* Create a new one and link it */
1371 dst_peer
= make_linked_ref(dst_name
, &dst_tail
);
1372 hashcpy(dst_peer
->new_sha1
, ref
->new_sha1
);
1374 dst_peer
->peer_ref
= copy_ref(ref
);
1375 dst_peer
->force
= pat
->force
;
1380 if (flags
& MATCH_REFS_FOLLOW_TAGS
)
1381 add_missing_tags(src
, dst
, &dst_tail
);
1384 /* check for missing refs on the remote */
1385 for (ref
= *dst
; ref
; ref
= ref
->next
) {
1389 /* We're already sending something to this ref. */
1392 src_name
= get_ref_match(rs
, nr_refspec
, ref
, send_mirror
, FROM_DST
, NULL
);
1394 if (!find_ref_by_name(src
, src_name
))
1395 ref
->peer_ref
= alloc_delete_ref();
1405 void set_ref_status_for_push(struct ref
*remote_refs
, int send_mirror
,
1410 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
1411 int force_ref_update
= ref
->force
|| force_update
;
1414 hashcpy(ref
->new_sha1
, ref
->peer_ref
->new_sha1
);
1415 else if (!send_mirror
)
1418 ref
->deletion
= is_null_sha1(ref
->new_sha1
);
1419 if (!ref
->deletion
&&
1420 !hashcmp(ref
->old_sha1
, ref
->new_sha1
)) {
1421 ref
->status
= REF_STATUS_UPTODATE
;
1426 * Decide whether an individual refspec A:B can be
1427 * pushed. The push will succeed if any of the
1428 * following are true:
1430 * (1) the remote reference B does not exist
1432 * (2) the remote reference B is being removed (i.e.,
1433 * pushing :B where no source is specified)
1435 * (3) the destination is not under refs/tags/, and
1436 * if the old and new value is a commit, the new
1437 * is a descendant of the old.
1439 * (4) it is forced using the +A:B notation, or by
1440 * passing the --force argument
1443 if (!ref
->deletion
&& !is_null_sha1(ref
->old_sha1
)) {
1444 int why
= 0; /* why would this push require --force? */
1446 if (!prefixcmp(ref
->name
, "refs/tags/"))
1447 why
= REF_STATUS_REJECT_ALREADY_EXISTS
;
1448 else if (!has_sha1_file(ref
->old_sha1
))
1449 why
= REF_STATUS_REJECT_FETCH_FIRST
;
1450 else if (!lookup_commit_reference_gently(ref
->old_sha1
, 1) ||
1451 !lookup_commit_reference_gently(ref
->new_sha1
, 1))
1452 why
= REF_STATUS_REJECT_NEEDS_FORCE
;
1453 else if (!ref_newer(ref
->new_sha1
, ref
->old_sha1
))
1454 why
= REF_STATUS_REJECT_NONFASTFORWARD
;
1456 if (!force_ref_update
)
1459 ref
->forced_update
= 1;
1464 struct branch
*branch_get(const char *name
)
1469 if (!name
|| !*name
|| !strcmp(name
, "HEAD"))
1470 ret
= current_branch
;
1472 ret
= make_branch(name
, 0);
1473 if (ret
&& ret
->remote_name
) {
1474 ret
->remote
= remote_get(ret
->remote_name
);
1475 if (ret
->merge_nr
) {
1477 ret
->merge
= xcalloc(ret
->merge_nr
, sizeof(*ret
->merge
));
1478 for (i
= 0; i
< ret
->merge_nr
; i
++) {
1479 ret
->merge
[i
] = xcalloc(1, sizeof(**ret
->merge
));
1480 ret
->merge
[i
]->src
= xstrdup(ret
->merge_name
[i
]);
1481 if (remote_find_tracking(ret
->remote
, ret
->merge
[i
])
1482 && !strcmp(ret
->remote_name
, "."))
1483 ret
->merge
[i
]->dst
= xstrdup(ret
->merge_name
[i
]);
1490 int branch_has_merge_config(struct branch
*branch
)
1492 return branch
&& !!branch
->merge
;
1495 int branch_merge_matches(struct branch
*branch
,
1497 const char *refname
)
1499 if (!branch
|| i
< 0 || i
>= branch
->merge_nr
)
1501 return refname_match(branch
->merge
[i
]->src
, refname
, ref_fetch_rules
);
1504 static int ignore_symref_update(const char *refname
)
1506 unsigned char sha1
[20];
1509 if (!resolve_ref_unsafe(refname
, sha1
, 0, &flag
))
1510 return 0; /* non-existing refs are OK */
1511 return (flag
& REF_ISSYMREF
);
1514 static struct ref
*get_expanded_map(const struct ref
*remote_refs
,
1515 const struct refspec
*refspec
)
1517 const struct ref
*ref
;
1518 struct ref
*ret
= NULL
;
1519 struct ref
**tail
= &ret
;
1523 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
1524 if (strchr(ref
->name
, '^'))
1525 continue; /* a dereference item */
1526 if (match_name_with_pattern(refspec
->src
, ref
->name
,
1527 refspec
->dst
, &expn_name
) &&
1528 !ignore_symref_update(expn_name
)) {
1529 struct ref
*cpy
= copy_ref(ref
);
1531 cpy
->peer_ref
= alloc_ref(expn_name
);
1534 cpy
->peer_ref
->force
= 1;
1543 static const struct ref
*find_ref_by_name_abbrev(const struct ref
*refs
, const char *name
)
1545 const struct ref
*ref
;
1546 for (ref
= refs
; ref
; ref
= ref
->next
) {
1547 if (refname_match(name
, ref
->name
, ref_fetch_rules
))
1553 struct ref
*get_remote_ref(const struct ref
*remote_refs
, const char *name
)
1555 const struct ref
*ref
= find_ref_by_name_abbrev(remote_refs
, name
);
1560 return copy_ref(ref
);
1563 static struct ref
*get_local_ref(const char *name
)
1565 if (!name
|| name
[0] == '\0')
1568 if (!prefixcmp(name
, "refs/"))
1569 return alloc_ref(name
);
1571 if (!prefixcmp(name
, "heads/") ||
1572 !prefixcmp(name
, "tags/") ||
1573 !prefixcmp(name
, "remotes/"))
1574 return alloc_ref_with_prefix("refs/", 5, name
);
1576 return alloc_ref_with_prefix("refs/heads/", 11, name
);
1579 int get_fetch_map(const struct ref
*remote_refs
,
1580 const struct refspec
*refspec
,
1584 struct ref
*ref_map
, **rmp
;
1586 if (refspec
->pattern
) {
1587 ref_map
= get_expanded_map(remote_refs
, refspec
);
1589 const char *name
= refspec
->src
[0] ? refspec
->src
: "HEAD";
1591 if (refspec
->exact_sha1
) {
1592 ref_map
= alloc_ref(name
);
1593 get_sha1_hex(name
, ref_map
->old_sha1
);
1595 ref_map
= get_remote_ref(remote_refs
, name
);
1597 if (!missing_ok
&& !ref_map
)
1598 die("Couldn't find remote ref %s", name
);
1600 ref_map
->peer_ref
= get_local_ref(refspec
->dst
);
1601 if (ref_map
->peer_ref
&& refspec
->force
)
1602 ref_map
->peer_ref
->force
= 1;
1606 for (rmp
= &ref_map
; *rmp
; ) {
1607 if ((*rmp
)->peer_ref
) {
1608 if (prefixcmp((*rmp
)->peer_ref
->name
, "refs/") ||
1609 check_refname_format((*rmp
)->peer_ref
->name
, 0)) {
1610 struct ref
*ignore
= *rmp
;
1611 error("* Ignoring funny ref '%s' locally",
1612 (*rmp
)->peer_ref
->name
);
1613 *rmp
= (*rmp
)->next
;
1614 free(ignore
->peer_ref
);
1619 rmp
= &((*rmp
)->next
);
1623 tail_link_ref(ref_map
, tail
);
1628 int resolve_remote_symref(struct ref
*ref
, struct ref
*list
)
1632 for (; list
; list
= list
->next
)
1633 if (!strcmp(ref
->symref
, list
->name
)) {
1634 hashcpy(ref
->old_sha1
, list
->old_sha1
);
1640 static void unmark_and_free(struct commit_list
*list
, unsigned int mark
)
1643 struct commit_list
*temp
= list
;
1644 temp
->item
->object
.flags
&= ~mark
;
1650 int ref_newer(const unsigned char *new_sha1
, const unsigned char *old_sha1
)
1653 struct commit
*old
, *new;
1654 struct commit_list
*list
, *used
;
1658 * Both new and old must be commit-ish and new is descendant of
1659 * old. Otherwise we require --force.
1661 o
= deref_tag(parse_object(old_sha1
), NULL
, 0);
1662 if (!o
|| o
->type
!= OBJ_COMMIT
)
1664 old
= (struct commit
*) o
;
1666 o
= deref_tag(parse_object(new_sha1
), NULL
, 0);
1667 if (!o
|| o
->type
!= OBJ_COMMIT
)
1669 new = (struct commit
*) o
;
1671 if (parse_commit(new) < 0)
1675 commit_list_insert(new, &list
);
1677 new = pop_most_recent_commit(&list
, TMP_MARK
);
1678 commit_list_insert(new, &used
);
1684 unmark_and_free(list
, TMP_MARK
);
1685 unmark_and_free(used
, TMP_MARK
);
1690 * Return true if there is anything to report, otherwise false.
1692 int stat_tracking_info(struct branch
*branch
, int *num_ours
, int *num_theirs
)
1694 unsigned char sha1
[20];
1695 struct commit
*ours
, *theirs
;
1697 struct rev_info revs
;
1698 const char *rev_argv
[10], *base
;
1702 * Nothing to report unless we are marked to build on top of
1706 !branch
->merge
|| !branch
->merge
[0] || !branch
->merge
[0]->dst
)
1710 * If what we used to build on no longer exists, there is
1711 * nothing to report.
1713 base
= branch
->merge
[0]->dst
;
1714 if (read_ref(base
, sha1
))
1716 theirs
= lookup_commit_reference(sha1
);
1720 if (read_ref(branch
->refname
, sha1
))
1722 ours
= lookup_commit_reference(sha1
);
1726 /* are we the same? */
1730 /* Run "rev-list --left-right ours...theirs" internally... */
1732 rev_argv
[rev_argc
++] = NULL
;
1733 rev_argv
[rev_argc
++] = "--left-right";
1734 rev_argv
[rev_argc
++] = symmetric
;
1735 rev_argv
[rev_argc
++] = "--";
1736 rev_argv
[rev_argc
] = NULL
;
1738 strcpy(symmetric
, sha1_to_hex(ours
->object
.sha1
));
1739 strcpy(symmetric
+ 40, "...");
1740 strcpy(symmetric
+ 43, sha1_to_hex(theirs
->object
.sha1
));
1742 init_revisions(&revs
, NULL
);
1743 setup_revisions(rev_argc
, rev_argv
, &revs
, NULL
);
1744 prepare_revision_walk(&revs
);
1746 /* ... and count the commits on each side. */
1750 struct commit
*c
= get_revision(&revs
);
1753 if (c
->object
.flags
& SYMMETRIC_LEFT
)
1759 /* clear object flags smudged by the above traversal */
1760 clear_commit_marks(ours
, ALL_REV_FLAGS
);
1761 clear_commit_marks(theirs
, ALL_REV_FLAGS
);
1766 * Return true when there is anything to report, otherwise false.
1768 int format_tracking_info(struct branch
*branch
, struct strbuf
*sb
)
1770 int num_ours
, num_theirs
;
1773 if (!stat_tracking_info(branch
, &num_ours
, &num_theirs
))
1776 base
= branch
->merge
[0]->dst
;
1777 base
= shorten_unambiguous_ref(base
, 0);
1780 Q_("Your branch is ahead of '%s' by %d commit.\n",
1781 "Your branch is ahead of '%s' by %d commits.\n",
1784 if (advice_status_hints
)
1786 _(" (use \"git push\" to publish your local commits)\n"));
1787 } else if (!num_ours
) {
1789 Q_("Your branch is behind '%s' by %d commit, "
1790 "and can be fast-forwarded.\n",
1791 "Your branch is behind '%s' by %d commits, "
1792 "and can be fast-forwarded.\n",
1795 if (advice_status_hints
)
1797 _(" (use \"git pull\" to update your local branch)\n"));
1800 Q_("Your branch and '%s' have diverged,\n"
1801 "and have %d and %d different commit each, "
1803 "Your branch and '%s' have diverged,\n"
1804 "and have %d and %d different commits each, "
1807 base
, num_ours
, num_theirs
);
1808 if (advice_status_hints
)
1810 _(" (use \"git pull\" to merge the remote branch into yours)\n"));
1815 static int one_local_ref(const char *refname
, const unsigned char *sha1
, int flag
, void *cb_data
)
1817 struct ref
***local_tail
= cb_data
;
1821 /* we already know it starts with refs/ to get here */
1822 if (check_refname_format(refname
+ 5, 0))
1825 len
= strlen(refname
) + 1;
1826 ref
= xcalloc(1, sizeof(*ref
) + len
);
1827 hashcpy(ref
->new_sha1
, sha1
);
1828 memcpy(ref
->name
, refname
, len
);
1830 *local_tail
= &ref
->next
;
1834 struct ref
*get_local_heads(void)
1836 struct ref
*local_refs
= NULL
, **local_tail
= &local_refs
;
1837 for_each_ref(one_local_ref
, &local_tail
);
1841 struct ref
*guess_remote_head(const struct ref
*head
,
1842 const struct ref
*refs
,
1845 const struct ref
*r
;
1846 struct ref
*list
= NULL
;
1847 struct ref
**tail
= &list
;
1853 * Some transports support directly peeking at
1854 * where HEAD points; if that is the case, then
1855 * we don't have to guess.
1858 return copy_ref(find_ref_by_name(refs
, head
->symref
));
1860 /* If refs/heads/master could be right, it is. */
1862 r
= find_ref_by_name(refs
, "refs/heads/master");
1863 if (r
&& !hashcmp(r
->old_sha1
, head
->old_sha1
))
1867 /* Look for another ref that points there */
1868 for (r
= refs
; r
; r
= r
->next
) {
1870 !prefixcmp(r
->name
, "refs/heads/") &&
1871 !hashcmp(r
->old_sha1
, head
->old_sha1
)) {
1872 *tail
= copy_ref(r
);
1873 tail
= &((*tail
)->next
);
1882 struct stale_heads_info
{
1883 struct string_list
*ref_names
;
1884 struct ref
**stale_refs_tail
;
1885 struct refspec
*refs
;
1889 static int get_stale_heads_cb(const char *refname
,
1890 const unsigned char *sha1
, int flags
, void *cb_data
)
1892 struct stale_heads_info
*info
= cb_data
;
1893 struct refspec query
;
1894 memset(&query
, 0, sizeof(struct refspec
));
1895 query
.dst
= (char *)refname
;
1897 if (query_refspecs(info
->refs
, info
->ref_count
, &query
))
1898 return 0; /* No matches */
1901 * If we did find a suitable refspec and it's not a symref and
1902 * it's not in the list of refs that currently exist in that
1903 * remote we consider it to be stale.
1905 if (!((flags
& REF_ISSYMREF
) ||
1906 string_list_has_string(info
->ref_names
, query
.src
))) {
1907 struct ref
*ref
= make_linked_ref(refname
, &info
->stale_refs_tail
);
1908 hashcpy(ref
->new_sha1
, sha1
);
1915 struct ref
*get_stale_heads(struct refspec
*refs
, int ref_count
, struct ref
*fetch_map
)
1917 struct ref
*ref
, *stale_refs
= NULL
;
1918 struct string_list ref_names
= STRING_LIST_INIT_NODUP
;
1919 struct stale_heads_info info
;
1920 info
.ref_names
= &ref_names
;
1921 info
.stale_refs_tail
= &stale_refs
;
1923 info
.ref_count
= ref_count
;
1924 for (ref
= fetch_map
; ref
; ref
= ref
->next
)
1925 string_list_append(&ref_names
, ref
->name
);
1926 sort_string_list(&ref_names
);
1927 for_each_ref(get_stale_heads_cb
, &info
);
1928 string_list_clear(&ref_names
, 0);