t7[5-9]*: adjust the references to the default branch name "main"
[git] / remote.c
1 #include "cache.h"
2 #include "config.h"
3 #include "remote.h"
4 #include "refs.h"
5 #include "refspec.h"
6 #include "object-store.h"
7 #include "commit.h"
8 #include "diff.h"
9 #include "revision.h"
10 #include "dir.h"
11 #include "tag.h"
12 #include "string-list.h"
13 #include "mergesort.h"
14 #include "strvec.h"
15 #include "commit-reach.h"
16 #include "advice.h"
17
18 enum map_direction { FROM_SRC, FROM_DST };
19
20 struct counted_string {
21         size_t len;
22         const char *s;
23 };
24 struct rewrite {
25         const char *base;
26         size_t baselen;
27         struct counted_string *instead_of;
28         int instead_of_nr;
29         int instead_of_alloc;
30 };
31 struct rewrites {
32         struct rewrite **rewrite;
33         int rewrite_alloc;
34         int rewrite_nr;
35 };
36
37 static struct remote **remotes;
38 static int remotes_alloc;
39 static int remotes_nr;
40 static struct hashmap remotes_hash;
41
42 static struct branch **branches;
43 static int branches_alloc;
44 static int branches_nr;
45
46 static struct branch *current_branch;
47 static const char *pushremote_name;
48
49 static struct rewrites rewrites;
50 static struct rewrites rewrites_push;
51
52 static int valid_remote(const struct remote *remote)
53 {
54         return (!!remote->url) || (!!remote->foreign_vcs);
55 }
56
57 static const char *alias_url(const char *url, struct rewrites *r)
58 {
59         int i, j;
60         struct counted_string *longest;
61         int longest_i;
62
63         longest = NULL;
64         longest_i = -1;
65         for (i = 0; i < r->rewrite_nr; i++) {
66                 if (!r->rewrite[i])
67                         continue;
68                 for (j = 0; j < r->rewrite[i]->instead_of_nr; j++) {
69                         if (starts_with(url, r->rewrite[i]->instead_of[j].s) &&
70                             (!longest ||
71                              longest->len < r->rewrite[i]->instead_of[j].len)) {
72                                 longest = &(r->rewrite[i]->instead_of[j]);
73                                 longest_i = i;
74                         }
75                 }
76         }
77         if (!longest)
78                 return url;
79
80         return xstrfmt("%s%s", r->rewrite[longest_i]->base, url + longest->len);
81 }
82
83 static void add_url(struct remote *remote, const char *url)
84 {
85         ALLOC_GROW(remote->url, remote->url_nr + 1, remote->url_alloc);
86         remote->url[remote->url_nr++] = url;
87 }
88
89 static void add_pushurl(struct remote *remote, const char *pushurl)
90 {
91         ALLOC_GROW(remote->pushurl, remote->pushurl_nr + 1, remote->pushurl_alloc);
92         remote->pushurl[remote->pushurl_nr++] = pushurl;
93 }
94
95 static void add_pushurl_alias(struct remote *remote, const char *url)
96 {
97         const char *pushurl = alias_url(url, &rewrites_push);
98         if (pushurl != url)
99                 add_pushurl(remote, pushurl);
100 }
101
102 static void add_url_alias(struct remote *remote, const char *url)
103 {
104         add_url(remote, alias_url(url, &rewrites));
105         add_pushurl_alias(remote, url);
106 }
107
108 struct remotes_hash_key {
109         const char *str;
110         int len;
111 };
112
113 static int remotes_hash_cmp(const void *unused_cmp_data,
114                             const struct hashmap_entry *eptr,
115                             const struct hashmap_entry *entry_or_key,
116                             const void *keydata)
117 {
118         const struct remote *a, *b;
119         const struct remotes_hash_key *key = keydata;
120
121         a = container_of(eptr, const struct remote, ent);
122         b = container_of(entry_or_key, const struct remote, ent);
123
124         if (key)
125                 return strncmp(a->name, key->str, key->len) || a->name[key->len];
126         else
127                 return strcmp(a->name, b->name);
128 }
129
130 static inline void init_remotes_hash(void)
131 {
132         if (!remotes_hash.cmpfn)
133                 hashmap_init(&remotes_hash, remotes_hash_cmp, NULL, 0);
134 }
135
136 static struct remote *make_remote(const char *name, int len)
137 {
138         struct remote *ret, *replaced;
139         struct remotes_hash_key lookup;
140         struct hashmap_entry lookup_entry, *e;
141
142         if (!len)
143                 len = strlen(name);
144
145         init_remotes_hash();
146         lookup.str = name;
147         lookup.len = len;
148         hashmap_entry_init(&lookup_entry, memhash(name, len));
149
150         e = hashmap_get(&remotes_hash, &lookup_entry, &lookup);
151         if (e)
152                 return container_of(e, struct remote, ent);
153
154         ret = xcalloc(1, sizeof(struct remote));
155         ret->prune = -1;  /* unspecified */
156         ret->prune_tags = -1;  /* unspecified */
157         ret->name = xstrndup(name, len);
158         refspec_init(&ret->push, REFSPEC_PUSH);
159         refspec_init(&ret->fetch, REFSPEC_FETCH);
160
161         ALLOC_GROW(remotes, remotes_nr + 1, remotes_alloc);
162         remotes[remotes_nr++] = ret;
163
164         hashmap_entry_init(&ret->ent, lookup_entry.hash);
165         replaced = hashmap_put_entry(&remotes_hash, ret, ent);
166         assert(replaced == NULL);  /* no previous entry overwritten */
167         return ret;
168 }
169
170 static void add_merge(struct branch *branch, const char *name)
171 {
172         ALLOC_GROW(branch->merge_name, branch->merge_nr + 1,
173                    branch->merge_alloc);
174         branch->merge_name[branch->merge_nr++] = name;
175 }
176
177 static struct branch *make_branch(const char *name, size_t len)
178 {
179         struct branch *ret;
180         int i;
181
182         for (i = 0; i < branches_nr; i++) {
183                 if (!strncmp(name, branches[i]->name, len) &&
184                     !branches[i]->name[len])
185                         return branches[i];
186         }
187
188         ALLOC_GROW(branches, branches_nr + 1, branches_alloc);
189         ret = xcalloc(1, sizeof(struct branch));
190         branches[branches_nr++] = ret;
191         ret->name = xstrndup(name, len);
192         ret->refname = xstrfmt("refs/heads/%s", ret->name);
193
194         return ret;
195 }
196
197 static struct rewrite *make_rewrite(struct rewrites *r,
198                                     const char *base, size_t len)
199 {
200         struct rewrite *ret;
201         int i;
202
203         for (i = 0; i < r->rewrite_nr; i++) {
204                 if (len == r->rewrite[i]->baselen &&
205                     !strncmp(base, r->rewrite[i]->base, len))
206                         return r->rewrite[i];
207         }
208
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;
212         ret->base = xstrndup(base, len);
213         ret->baselen = len;
214         return ret;
215 }
216
217 static void add_instead_of(struct rewrite *rewrite, const char *instead_of)
218 {
219         ALLOC_GROW(rewrite->instead_of, rewrite->instead_of_nr + 1, rewrite->instead_of_alloc);
220         rewrite->instead_of[rewrite->instead_of_nr].s = instead_of;
221         rewrite->instead_of[rewrite->instead_of_nr].len = strlen(instead_of);
222         rewrite->instead_of_nr++;
223 }
224
225 static const char *skip_spaces(const char *s)
226 {
227         while (isspace(*s))
228                 s++;
229         return s;
230 }
231
232 static void read_remotes_file(struct remote *remote)
233 {
234         struct strbuf buf = STRBUF_INIT;
235         FILE *f = fopen_or_warn(git_path("remotes/%s", remote->name), "r");
236
237         if (!f)
238                 return;
239         remote->configured_in_repo = 1;
240         remote->origin = REMOTE_REMOTES;
241         while (strbuf_getline(&buf, f) != EOF) {
242                 const char *v;
243
244                 strbuf_rtrim(&buf);
245
246                 if (skip_prefix(buf.buf, "URL:", &v))
247                         add_url_alias(remote, xstrdup(skip_spaces(v)));
248                 else if (skip_prefix(buf.buf, "Push:", &v))
249                         refspec_append(&remote->push, skip_spaces(v));
250                 else if (skip_prefix(buf.buf, "Pull:", &v))
251                         refspec_append(&remote->fetch, skip_spaces(v));
252         }
253         strbuf_release(&buf);
254         fclose(f);
255 }
256
257 static void read_branches_file(struct remote *remote)
258 {
259         char *frag;
260         struct strbuf buf = STRBUF_INIT;
261         FILE *f = fopen_or_warn(git_path("branches/%s", remote->name), "r");
262
263         if (!f)
264                 return;
265
266         strbuf_getline_lf(&buf, f);
267         fclose(f);
268         strbuf_trim(&buf);
269         if (!buf.len) {
270                 strbuf_release(&buf);
271                 return;
272         }
273
274         remote->configured_in_repo = 1;
275         remote->origin = REMOTE_BRANCHES;
276
277         /*
278          * The branches file would have URL and optionally
279          * #branch specified.  The default (or specified) branch is
280          * fetched and stored in the local branch matching the
281          * remote name.
282          */
283         frag = strchr(buf.buf, '#');
284         if (frag)
285                 *(frag++) = '\0';
286         else
287                 frag = (char *)git_default_branch_name();
288
289         add_url_alias(remote, strbuf_detach(&buf, NULL));
290         refspec_appendf(&remote->fetch, "refs/heads/%s:refs/heads/%s",
291                         frag, remote->name);
292
293         /*
294          * Cogito compatible push: push current HEAD to remote #branch
295          * (master if missing)
296          */
297         refspec_appendf(&remote->push, "HEAD:refs/heads/%s", frag);
298         remote->fetch_tags = 1; /* always auto-follow */
299 }
300
301 static int handle_config(const char *key, const char *value, void *cb)
302 {
303         const char *name;
304         size_t namelen;
305         const char *subkey;
306         struct remote *remote;
307         struct branch *branch;
308         if (parse_config_key(key, "branch", &name, &namelen, &subkey) >= 0) {
309                 if (!name)
310                         return 0;
311                 branch = make_branch(name, namelen);
312                 if (!strcmp(subkey, "remote")) {
313                         return git_config_string(&branch->remote_name, key, value);
314                 } else if (!strcmp(subkey, "pushremote")) {
315                         return git_config_string(&branch->pushremote_name, key, value);
316                 } else if (!strcmp(subkey, "merge")) {
317                         if (!value)
318                                 return config_error_nonbool(key);
319                         add_merge(branch, xstrdup(value));
320                 }
321                 return 0;
322         }
323         if (parse_config_key(key, "url", &name, &namelen, &subkey) >= 0) {
324                 struct rewrite *rewrite;
325                 if (!name)
326                         return 0;
327                 if (!strcmp(subkey, "insteadof")) {
328                         if (!value)
329                                 return config_error_nonbool(key);
330                         rewrite = make_rewrite(&rewrites, name, namelen);
331                         add_instead_of(rewrite, xstrdup(value));
332                 } else if (!strcmp(subkey, "pushinsteadof")) {
333                         if (!value)
334                                 return config_error_nonbool(key);
335                         rewrite = make_rewrite(&rewrites_push, name, namelen);
336                         add_instead_of(rewrite, xstrdup(value));
337                 }
338         }
339
340         if (parse_config_key(key, "remote", &name, &namelen, &subkey) < 0)
341                 return 0;
342
343         /* Handle remote.* variables */
344         if (!name && !strcmp(subkey, "pushdefault"))
345                 return git_config_string(&pushremote_name, key, value);
346
347         if (!name)
348                 return 0;
349         /* Handle remote.<name>.* variables */
350         if (*name == '/') {
351                 warning(_("config remote shorthand cannot begin with '/': %s"),
352                         name);
353                 return 0;
354         }
355         remote = make_remote(name, namelen);
356         remote->origin = REMOTE_CONFIG;
357         if (current_config_scope() == CONFIG_SCOPE_LOCAL ||
358         current_config_scope() == CONFIG_SCOPE_WORKTREE)
359                 remote->configured_in_repo = 1;
360         if (!strcmp(subkey, "mirror"))
361                 remote->mirror = git_config_bool(key, value);
362         else if (!strcmp(subkey, "skipdefaultupdate"))
363                 remote->skip_default_update = git_config_bool(key, value);
364         else if (!strcmp(subkey, "skipfetchall"))
365                 remote->skip_default_update = git_config_bool(key, value);
366         else if (!strcmp(subkey, "prune"))
367                 remote->prune = git_config_bool(key, value);
368         else if (!strcmp(subkey, "prunetags"))
369                 remote->prune_tags = git_config_bool(key, value);
370         else if (!strcmp(subkey, "url")) {
371                 const char *v;
372                 if (git_config_string(&v, key, value))
373                         return -1;
374                 add_url(remote, v);
375         } else if (!strcmp(subkey, "pushurl")) {
376                 const char *v;
377                 if (git_config_string(&v, key, value))
378                         return -1;
379                 add_pushurl(remote, v);
380         } else if (!strcmp(subkey, "push")) {
381                 const char *v;
382                 if (git_config_string(&v, key, value))
383                         return -1;
384                 refspec_append(&remote->push, v);
385                 free((char *)v);
386         } else if (!strcmp(subkey, "fetch")) {
387                 const char *v;
388                 if (git_config_string(&v, key, value))
389                         return -1;
390                 refspec_append(&remote->fetch, v);
391                 free((char *)v);
392         } else if (!strcmp(subkey, "receivepack")) {
393                 const char *v;
394                 if (git_config_string(&v, key, value))
395                         return -1;
396                 if (!remote->receivepack)
397                         remote->receivepack = v;
398                 else
399                         error(_("more than one receivepack given, using the first"));
400         } else if (!strcmp(subkey, "uploadpack")) {
401                 const char *v;
402                 if (git_config_string(&v, key, value))
403                         return -1;
404                 if (!remote->uploadpack)
405                         remote->uploadpack = v;
406                 else
407                         error(_("more than one uploadpack given, using the first"));
408         } else if (!strcmp(subkey, "tagopt")) {
409                 if (!strcmp(value, "--no-tags"))
410                         remote->fetch_tags = -1;
411                 else if (!strcmp(value, "--tags"))
412                         remote->fetch_tags = 2;
413         } else if (!strcmp(subkey, "proxy")) {
414                 return git_config_string((const char **)&remote->http_proxy,
415                                          key, value);
416         } else if (!strcmp(subkey, "proxyauthmethod")) {
417                 return git_config_string((const char **)&remote->http_proxy_authmethod,
418                                          key, value);
419         } else if (!strcmp(subkey, "vcs")) {
420                 return git_config_string(&remote->foreign_vcs, key, value);
421         }
422         return 0;
423 }
424
425 static void alias_all_urls(void)
426 {
427         int i, j;
428         for (i = 0; i < remotes_nr; i++) {
429                 int add_pushurl_aliases;
430                 if (!remotes[i])
431                         continue;
432                 for (j = 0; j < remotes[i]->pushurl_nr; j++) {
433                         remotes[i]->pushurl[j] = alias_url(remotes[i]->pushurl[j], &rewrites);
434                 }
435                 add_pushurl_aliases = remotes[i]->pushurl_nr == 0;
436                 for (j = 0; j < remotes[i]->url_nr; j++) {
437                         if (add_pushurl_aliases)
438                                 add_pushurl_alias(remotes[i], remotes[i]->url[j]);
439                         remotes[i]->url[j] = alias_url(remotes[i]->url[j], &rewrites);
440                 }
441         }
442 }
443
444 static void read_config(void)
445 {
446         static int loaded;
447         int flag;
448
449         if (loaded)
450                 return;
451         loaded = 1;
452
453         current_branch = NULL;
454         if (startup_info->have_repository) {
455                 const char *head_ref = resolve_ref_unsafe("HEAD", 0, NULL, &flag);
456                 if (head_ref && (flag & REF_ISSYMREF) &&
457                     skip_prefix(head_ref, "refs/heads/", &head_ref)) {
458                         current_branch = make_branch(head_ref, strlen(head_ref));
459                 }
460         }
461         git_config(handle_config, NULL);
462         alias_all_urls();
463 }
464
465 static int valid_remote_nick(const char *name)
466 {
467         if (!name[0] || is_dot_or_dotdot(name))
468                 return 0;
469
470         /* remote nicknames cannot contain slashes */
471         while (*name)
472                 if (is_dir_sep(*name++))
473                         return 0;
474         return 1;
475 }
476
477 const char *remote_for_branch(struct branch *branch, int *explicit)
478 {
479         if (branch && branch->remote_name) {
480                 if (explicit)
481                         *explicit = 1;
482                 return branch->remote_name;
483         }
484         if (explicit)
485                 *explicit = 0;
486         return "origin";
487 }
488
489 const char *pushremote_for_branch(struct branch *branch, int *explicit)
490 {
491         if (branch && branch->pushremote_name) {
492                 if (explicit)
493                         *explicit = 1;
494                 return branch->pushremote_name;
495         }
496         if (pushremote_name) {
497                 if (explicit)
498                         *explicit = 1;
499                 return pushremote_name;
500         }
501         return remote_for_branch(branch, explicit);
502 }
503
504 const char *remote_ref_for_branch(struct branch *branch, int for_push)
505 {
506         if (branch) {
507                 if (!for_push) {
508                         if (branch->merge_nr) {
509                                 return branch->merge_name[0];
510                         }
511                 } else {
512                         const char *dst, *remote_name =
513                                 pushremote_for_branch(branch, NULL);
514                         struct remote *remote = remote_get(remote_name);
515
516                         if (remote && remote->push.nr &&
517                             (dst = apply_refspecs(&remote->push,
518                                                   branch->refname))) {
519                                 return dst;
520                         }
521                 }
522         }
523         return NULL;
524 }
525
526 static struct remote *remote_get_1(const char *name,
527                                    const char *(*get_default)(struct branch *, int *))
528 {
529         struct remote *ret;
530         int name_given = 0;
531
532         read_config();
533
534         if (name)
535                 name_given = 1;
536         else
537                 name = get_default(current_branch, &name_given);
538
539         ret = make_remote(name, 0);
540         if (valid_remote_nick(name) && have_git_dir()) {
541                 if (!valid_remote(ret))
542                         read_remotes_file(ret);
543                 if (!valid_remote(ret))
544                         read_branches_file(ret);
545         }
546         if (name_given && !valid_remote(ret))
547                 add_url_alias(ret, name);
548         if (!valid_remote(ret))
549                 return NULL;
550         return ret;
551 }
552
553 struct remote *remote_get(const char *name)
554 {
555         return remote_get_1(name, remote_for_branch);
556 }
557
558 struct remote *pushremote_get(const char *name)
559 {
560         return remote_get_1(name, pushremote_for_branch);
561 }
562
563 int remote_is_configured(struct remote *remote, int in_repo)
564 {
565         if (!remote)
566                 return 0;
567         if (in_repo)
568                 return remote->configured_in_repo;
569         return !!remote->origin;
570 }
571
572 int for_each_remote(each_remote_fn fn, void *priv)
573 {
574         int i, result = 0;
575         read_config();
576         for (i = 0; i < remotes_nr && !result; i++) {
577                 struct remote *r = remotes[i];
578                 if (!r)
579                         continue;
580                 result = fn(r, priv);
581         }
582         return result;
583 }
584
585 static void handle_duplicate(struct ref *ref1, struct ref *ref2)
586 {
587         if (strcmp(ref1->name, ref2->name)) {
588                 if (ref1->fetch_head_status != FETCH_HEAD_IGNORE &&
589                     ref2->fetch_head_status != FETCH_HEAD_IGNORE) {
590                         die(_("Cannot fetch both %s and %s to %s"),
591                             ref1->name, ref2->name, ref2->peer_ref->name);
592                 } else if (ref1->fetch_head_status != FETCH_HEAD_IGNORE &&
593                            ref2->fetch_head_status == FETCH_HEAD_IGNORE) {
594                         warning(_("%s usually tracks %s, not %s"),
595                                 ref2->peer_ref->name, ref2->name, ref1->name);
596                 } else if (ref1->fetch_head_status == FETCH_HEAD_IGNORE &&
597                            ref2->fetch_head_status == FETCH_HEAD_IGNORE) {
598                         die(_("%s tracks both %s and %s"),
599                             ref2->peer_ref->name, ref1->name, ref2->name);
600                 } else {
601                         /*
602                          * This last possibility doesn't occur because
603                          * FETCH_HEAD_IGNORE entries always appear at
604                          * the end of the list.
605                          */
606                         BUG("Internal error");
607                 }
608         }
609         free(ref2->peer_ref);
610         free(ref2);
611 }
612
613 struct ref *ref_remove_duplicates(struct ref *ref_map)
614 {
615         struct string_list refs = STRING_LIST_INIT_NODUP;
616         struct ref *retval = NULL;
617         struct ref **p = &retval;
618
619         while (ref_map) {
620                 struct ref *ref = ref_map;
621
622                 ref_map = ref_map->next;
623                 ref->next = NULL;
624
625                 if (!ref->peer_ref) {
626                         *p = ref;
627                         p = &ref->next;
628                 } else {
629                         struct string_list_item *item =
630                                 string_list_insert(&refs, ref->peer_ref->name);
631
632                         if (item->util) {
633                                 /* Entry already existed */
634                                 handle_duplicate((struct ref *)item->util, ref);
635                         } else {
636                                 *p = ref;
637                                 p = &ref->next;
638                                 item->util = ref;
639                         }
640                 }
641         }
642
643         string_list_clear(&refs, 0);
644         return retval;
645 }
646
647 int remote_has_url(struct remote *remote, const char *url)
648 {
649         int i;
650         for (i = 0; i < remote->url_nr; i++) {
651                 if (!strcmp(remote->url[i], url))
652                         return 1;
653         }
654         return 0;
655 }
656
657 static int match_name_with_pattern(const char *key, const char *name,
658                                    const char *value, char **result)
659 {
660         const char *kstar = strchr(key, '*');
661         size_t klen;
662         size_t ksuffixlen;
663         size_t namelen;
664         int ret;
665         if (!kstar)
666                 die(_("key '%s' of pattern had no '*'"), key);
667         klen = kstar - key;
668         ksuffixlen = strlen(kstar + 1);
669         namelen = strlen(name);
670         ret = !strncmp(name, key, klen) && namelen >= klen + ksuffixlen &&
671                 !memcmp(name + namelen - ksuffixlen, kstar + 1, ksuffixlen);
672         if (ret && value) {
673                 struct strbuf sb = STRBUF_INIT;
674                 const char *vstar = strchr(value, '*');
675                 if (!vstar)
676                         die(_("value '%s' of pattern has no '*'"), value);
677                 strbuf_add(&sb, value, vstar - value);
678                 strbuf_add(&sb, name + klen, namelen - klen - ksuffixlen);
679                 strbuf_addstr(&sb, vstar + 1);
680                 *result = strbuf_detach(&sb, NULL);
681         }
682         return ret;
683 }
684
685 static int refspec_match(const struct refspec_item *refspec,
686                          const char *name)
687 {
688         if (refspec->pattern)
689                 return match_name_with_pattern(refspec->src, name, NULL, NULL);
690
691         return !strcmp(refspec->src, name);
692 }
693
694 static int omit_name_by_refspec(const char *name, struct refspec *rs)
695 {
696         int i;
697
698         for (i = 0; i < rs->nr; i++) {
699                 if (rs->items[i].negative && refspec_match(&rs->items[i], name))
700                         return 1;
701         }
702         return 0;
703 }
704
705 struct ref *apply_negative_refspecs(struct ref *ref_map, struct refspec *rs)
706 {
707         struct ref **tail;
708
709         for (tail = &ref_map; *tail; ) {
710                 struct ref *ref = *tail;
711
712                 if (omit_name_by_refspec(ref->name, rs)) {
713                         *tail = ref->next;
714                         free(ref->peer_ref);
715                         free(ref);
716                 } else
717                         tail = &ref->next;
718         }
719
720         return ref_map;
721 }
722
723 static int query_matches_negative_refspec(struct refspec *rs, struct refspec_item *query)
724 {
725         int i, matched_negative = 0;
726         int find_src = !query->src;
727         struct string_list reversed = STRING_LIST_INIT_NODUP;
728         const char *needle = find_src ? query->dst : query->src;
729
730         /*
731          * Check whether the queried ref matches any negative refpsec. If so,
732          * then we should ultimately treat this as not matching the query at
733          * all.
734          *
735          * Note that negative refspecs always match the source, but the query
736          * item uses the destination. To handle this, we apply pattern
737          * refspecs in reverse to figure out if the query source matches any
738          * of the negative refspecs.
739          */
740         for (i = 0; i < rs->nr; i++) {
741                 struct refspec_item *refspec = &rs->items[i];
742                 char *expn_name;
743
744                 if (refspec->negative)
745                         continue;
746
747                 /* Note the reversal of src and dst */
748                 if (refspec->pattern) {
749                         const char *key = refspec->dst ? refspec->dst : refspec->src;
750                         const char *value = refspec->src;
751
752                         if (match_name_with_pattern(key, needle, value, &expn_name))
753                                 string_list_append_nodup(&reversed, expn_name);
754                 } else {
755                         if (!strcmp(needle, refspec->src))
756                                 string_list_append(&reversed, refspec->src);
757                 }
758         }
759
760         for (i = 0; !matched_negative && i < reversed.nr; i++) {
761                 if (omit_name_by_refspec(reversed.items[i].string, rs))
762                         matched_negative = 1;
763         }
764
765         string_list_clear(&reversed, 0);
766
767         return matched_negative;
768 }
769
770 static void query_refspecs_multiple(struct refspec *rs,
771                                     struct refspec_item *query,
772                                     struct string_list *results)
773 {
774         int i;
775         int find_src = !query->src;
776
777         if (find_src && !query->dst)
778                 BUG("query_refspecs_multiple: need either src or dst");
779
780         if (query_matches_negative_refspec(rs, query))
781                 return;
782
783         for (i = 0; i < rs->nr; i++) {
784                 struct refspec_item *refspec = &rs->items[i];
785                 const char *key = find_src ? refspec->dst : refspec->src;
786                 const char *value = find_src ? refspec->src : refspec->dst;
787                 const char *needle = find_src ? query->dst : query->src;
788                 char **result = find_src ? &query->src : &query->dst;
789
790                 if (!refspec->dst || refspec->negative)
791                         continue;
792                 if (refspec->pattern) {
793                         if (match_name_with_pattern(key, needle, value, result))
794                                 string_list_append_nodup(results, *result);
795                 } else if (!strcmp(needle, key)) {
796                         string_list_append(results, value);
797                 }
798         }
799 }
800
801 int query_refspecs(struct refspec *rs, struct refspec_item *query)
802 {
803         int i;
804         int find_src = !query->src;
805         const char *needle = find_src ? query->dst : query->src;
806         char **result = find_src ? &query->src : &query->dst;
807
808         if (find_src && !query->dst)
809                 BUG("query_refspecs: need either src or dst");
810
811         if (query_matches_negative_refspec(rs, query))
812                 return -1;
813
814         for (i = 0; i < rs->nr; i++) {
815                 struct refspec_item *refspec = &rs->items[i];
816                 const char *key = find_src ? refspec->dst : refspec->src;
817                 const char *value = find_src ? refspec->src : refspec->dst;
818
819                 if (!refspec->dst || refspec->negative)
820                         continue;
821                 if (refspec->pattern) {
822                         if (match_name_with_pattern(key, needle, value, result)) {
823                                 query->force = refspec->force;
824                                 return 0;
825                         }
826                 } else if (!strcmp(needle, key)) {
827                         *result = xstrdup(value);
828                         query->force = refspec->force;
829                         return 0;
830                 }
831         }
832         return -1;
833 }
834
835 char *apply_refspecs(struct refspec *rs, const char *name)
836 {
837         struct refspec_item query;
838
839         memset(&query, 0, sizeof(struct refspec_item));
840         query.src = (char *)name;
841
842         if (query_refspecs(rs, &query))
843                 return NULL;
844
845         return query.dst;
846 }
847
848 int remote_find_tracking(struct remote *remote, struct refspec_item *refspec)
849 {
850         return query_refspecs(&remote->fetch, refspec);
851 }
852
853 static struct ref *alloc_ref_with_prefix(const char *prefix, size_t prefixlen,
854                 const char *name)
855 {
856         size_t len = strlen(name);
857         struct ref *ref = xcalloc(1, st_add4(sizeof(*ref), prefixlen, len, 1));
858         memcpy(ref->name, prefix, prefixlen);
859         memcpy(ref->name + prefixlen, name, len);
860         return ref;
861 }
862
863 struct ref *alloc_ref(const char *name)
864 {
865         return alloc_ref_with_prefix("", 0, name);
866 }
867
868 struct ref *copy_ref(const struct ref *ref)
869 {
870         struct ref *cpy;
871         size_t len;
872         if (!ref)
873                 return NULL;
874         len = st_add3(sizeof(struct ref), strlen(ref->name), 1);
875         cpy = xmalloc(len);
876         memcpy(cpy, ref, len);
877         cpy->next = NULL;
878         cpy->symref = xstrdup_or_null(ref->symref);
879         cpy->remote_status = xstrdup_or_null(ref->remote_status);
880         cpy->peer_ref = copy_ref(ref->peer_ref);
881         return cpy;
882 }
883
884 struct ref *copy_ref_list(const struct ref *ref)
885 {
886         struct ref *ret = NULL;
887         struct ref **tail = &ret;
888         while (ref) {
889                 *tail = copy_ref(ref);
890                 ref = ref->next;
891                 tail = &((*tail)->next);
892         }
893         return ret;
894 }
895
896 void free_one_ref(struct ref *ref)
897 {
898         if (!ref)
899                 return;
900         free_one_ref(ref->peer_ref);
901         free(ref->remote_status);
902         free(ref->symref);
903         free(ref);
904 }
905
906 void free_refs(struct ref *ref)
907 {
908         struct ref *next;
909         while (ref) {
910                 next = ref->next;
911                 free_one_ref(ref);
912                 ref = next;
913         }
914 }
915
916 int ref_compare_name(const void *va, const void *vb)
917 {
918         const struct ref *a = va, *b = vb;
919         return strcmp(a->name, b->name);
920 }
921
922 static void *ref_list_get_next(const void *a)
923 {
924         return ((const struct ref *)a)->next;
925 }
926
927 static void ref_list_set_next(void *a, void *next)
928 {
929         ((struct ref *)a)->next = next;
930 }
931
932 void sort_ref_list(struct ref **l, int (*cmp)(const void *, const void *))
933 {
934         *l = llist_mergesort(*l, ref_list_get_next, ref_list_set_next, cmp);
935 }
936
937 int count_refspec_match(const char *pattern,
938                         struct ref *refs,
939                         struct ref **matched_ref)
940 {
941         int patlen = strlen(pattern);
942         struct ref *matched_weak = NULL;
943         struct ref *matched = NULL;
944         int weak_match = 0;
945         int match = 0;
946
947         for (weak_match = match = 0; refs; refs = refs->next) {
948                 char *name = refs->name;
949                 int namelen = strlen(name);
950
951                 if (!refname_match(pattern, name))
952                         continue;
953
954                 /* A match is "weak" if it is with refs outside
955                  * heads or tags, and did not specify the pattern
956                  * in full (e.g. "refs/remotes/origin/master") or at
957                  * least from the toplevel (e.g. "remotes/origin/master");
958                  * otherwise "git push $URL master" would result in
959                  * ambiguity between remotes/origin/master and heads/master
960                  * at the remote site.
961                  */
962                 if (namelen != patlen &&
963                     patlen != namelen - 5 &&
964                     !starts_with(name, "refs/heads/") &&
965                     !starts_with(name, "refs/tags/")) {
966                         /* We want to catch the case where only weak
967                          * matches are found and there are multiple
968                          * matches, and where more than one strong
969                          * matches are found, as ambiguous.  One
970                          * strong match with zero or more weak matches
971                          * are acceptable as a unique match.
972                          */
973                         matched_weak = refs;
974                         weak_match++;
975                 }
976                 else {
977                         matched = refs;
978                         match++;
979                 }
980         }
981         if (!matched) {
982                 if (matched_ref)
983                         *matched_ref = matched_weak;
984                 return weak_match;
985         }
986         else {
987                 if (matched_ref)
988                         *matched_ref = matched;
989                 return match;
990         }
991 }
992
993 static void tail_link_ref(struct ref *ref, struct ref ***tail)
994 {
995         **tail = ref;
996         while (ref->next)
997                 ref = ref->next;
998         *tail = &ref->next;
999 }
1000
1001 static struct ref *alloc_delete_ref(void)
1002 {
1003         struct ref *ref = alloc_ref("(delete)");
1004         oidclr(&ref->new_oid);
1005         return ref;
1006 }
1007
1008 static int try_explicit_object_name(const char *name,
1009                                     struct ref **match)
1010 {
1011         struct object_id oid;
1012
1013         if (!*name) {
1014                 if (match)
1015                         *match = alloc_delete_ref();
1016                 return 0;
1017         }
1018
1019         if (get_oid(name, &oid))
1020                 return -1;
1021
1022         if (match) {
1023                 *match = alloc_ref(name);
1024                 oidcpy(&(*match)->new_oid, &oid);
1025         }
1026         return 0;
1027 }
1028
1029 static struct ref *make_linked_ref(const char *name, struct ref ***tail)
1030 {
1031         struct ref *ret = alloc_ref(name);
1032         tail_link_ref(ret, tail);
1033         return ret;
1034 }
1035
1036 static char *guess_ref(const char *name, struct ref *peer)
1037 {
1038         struct strbuf buf = STRBUF_INIT;
1039
1040         const char *r = resolve_ref_unsafe(peer->name, RESOLVE_REF_READING,
1041                                            NULL, NULL);
1042         if (!r)
1043                 return NULL;
1044
1045         if (starts_with(r, "refs/heads/")) {
1046                 strbuf_addstr(&buf, "refs/heads/");
1047         } else if (starts_with(r, "refs/tags/")) {
1048                 strbuf_addstr(&buf, "refs/tags/");
1049         } else {
1050                 return NULL;
1051         }
1052
1053         strbuf_addstr(&buf, name);
1054         return strbuf_detach(&buf, NULL);
1055 }
1056
1057 static int match_explicit_lhs(struct ref *src,
1058                               struct refspec_item *rs,
1059                               struct ref **match,
1060                               int *allocated_match)
1061 {
1062         switch (count_refspec_match(rs->src, src, match)) {
1063         case 1:
1064                 if (allocated_match)
1065                         *allocated_match = 0;
1066                 return 0;
1067         case 0:
1068                 /* The source could be in the get_sha1() format
1069                  * not a reference name.  :refs/other is a
1070                  * way to delete 'other' ref at the remote end.
1071                  */
1072                 if (try_explicit_object_name(rs->src, match) < 0)
1073                         return error(_("src refspec %s does not match any"), rs->src);
1074                 if (allocated_match)
1075                         *allocated_match = 1;
1076                 return 0;
1077         default:
1078                 return error(_("src refspec %s matches more than one"), rs->src);
1079         }
1080 }
1081
1082 static void show_push_unqualified_ref_name_error(const char *dst_value,
1083                                                  const char *matched_src_name)
1084 {
1085         struct object_id oid;
1086         enum object_type type;
1087
1088         /*
1089          * TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
1090          * <remote> <src>:<dst>" push, and "being pushed ('%s')" is
1091          * the <src>.
1092          */
1093         error(_("The destination you provided is not a full refname (i.e.,\n"
1094                 "starting with \"refs/\"). We tried to guess what you meant by:\n"
1095                 "\n"
1096                 "- Looking for a ref that matches '%s' on the remote side.\n"
1097                 "- Checking if the <src> being pushed ('%s')\n"
1098                 "  is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
1099                 "  refs/{heads,tags}/ prefix on the remote side.\n"
1100                 "\n"
1101                 "Neither worked, so we gave up. You must fully qualify the ref."),
1102               dst_value, matched_src_name);
1103
1104         if (!advice_push_unqualified_ref_name)
1105                 return;
1106
1107         if (get_oid(matched_src_name, &oid))
1108                 BUG("'%s' is not a valid object, "
1109                     "match_explicit_lhs() should catch this!",
1110                     matched_src_name);
1111         type = oid_object_info(the_repository, &oid, NULL);
1112         if (type == OBJ_COMMIT) {
1113                 advise(_("The <src> part of the refspec is a commit object.\n"
1114                          "Did you mean to create a new branch by pushing to\n"
1115                          "'%s:refs/heads/%s'?"),
1116                        matched_src_name, dst_value);
1117         } else if (type == OBJ_TAG) {
1118                 advise(_("The <src> part of the refspec is a tag object.\n"
1119                          "Did you mean to create a new tag by pushing to\n"
1120                          "'%s:refs/tags/%s'?"),
1121                        matched_src_name, dst_value);
1122         } else if (type == OBJ_TREE) {
1123                 advise(_("The <src> part of the refspec is a tree object.\n"
1124                          "Did you mean to tag a new tree by pushing to\n"
1125                          "'%s:refs/tags/%s'?"),
1126                        matched_src_name, dst_value);
1127         } else if (type == OBJ_BLOB) {
1128                 advise(_("The <src> part of the refspec is a blob object.\n"
1129                          "Did you mean to tag a new blob by pushing to\n"
1130                          "'%s:refs/tags/%s'?"),
1131                        matched_src_name, dst_value);
1132         } else {
1133                 BUG("'%s' should be commit/tag/tree/blob, is '%d'",
1134                     matched_src_name, type);
1135         }
1136 }
1137
1138 static int match_explicit(struct ref *src, struct ref *dst,
1139                           struct ref ***dst_tail,
1140                           struct refspec_item *rs)
1141 {
1142         struct ref *matched_src, *matched_dst;
1143         int allocated_src;
1144
1145         const char *dst_value = rs->dst;
1146         char *dst_guess;
1147
1148         if (rs->pattern || rs->matching || rs->negative)
1149                 return 0;
1150
1151         matched_src = matched_dst = NULL;
1152         if (match_explicit_lhs(src, rs, &matched_src, &allocated_src) < 0)
1153                 return -1;
1154
1155         if (!dst_value) {
1156                 int flag;
1157
1158                 dst_value = resolve_ref_unsafe(matched_src->name,
1159                                                RESOLVE_REF_READING,
1160                                                NULL, &flag);
1161                 if (!dst_value ||
1162                     ((flag & REF_ISSYMREF) &&
1163                      !starts_with(dst_value, "refs/heads/")))
1164                         die(_("%s cannot be resolved to branch"),
1165                             matched_src->name);
1166         }
1167
1168         switch (count_refspec_match(dst_value, dst, &matched_dst)) {
1169         case 1:
1170                 break;
1171         case 0:
1172                 if (starts_with(dst_value, "refs/")) {
1173                         matched_dst = make_linked_ref(dst_value, dst_tail);
1174                 } else if (is_null_oid(&matched_src->new_oid)) {
1175                         error(_("unable to delete '%s': remote ref does not exist"),
1176                               dst_value);
1177                 } else if ((dst_guess = guess_ref(dst_value, matched_src))) {
1178                         matched_dst = make_linked_ref(dst_guess, dst_tail);
1179                         free(dst_guess);
1180                 } else {
1181                         show_push_unqualified_ref_name_error(dst_value,
1182                                                              matched_src->name);
1183                 }
1184                 break;
1185         default:
1186                 matched_dst = NULL;
1187                 error(_("dst refspec %s matches more than one"),
1188                       dst_value);
1189                 break;
1190         }
1191         if (!matched_dst)
1192                 return -1;
1193         if (matched_dst->peer_ref)
1194                 return error(_("dst ref %s receives from more than one src"),
1195                              matched_dst->name);
1196         else {
1197                 matched_dst->peer_ref = allocated_src ?
1198                                         matched_src :
1199                                         copy_ref(matched_src);
1200                 matched_dst->force = rs->force;
1201         }
1202         return 0;
1203 }
1204
1205 static int match_explicit_refs(struct ref *src, struct ref *dst,
1206                                struct ref ***dst_tail, struct refspec *rs)
1207 {
1208         int i, errs;
1209         for (i = errs = 0; i < rs->nr; i++)
1210                 errs += match_explicit(src, dst, dst_tail, &rs->items[i]);
1211         return errs;
1212 }
1213
1214 static char *get_ref_match(const struct refspec *rs, const struct ref *ref,
1215                            int send_mirror, int direction,
1216                            const struct refspec_item **ret_pat)
1217 {
1218         const struct refspec_item *pat;
1219         char *name;
1220         int i;
1221         int matching_refs = -1;
1222         for (i = 0; i < rs->nr; i++) {
1223                 const struct refspec_item *item = &rs->items[i];
1224
1225                 if (item->negative)
1226                         continue;
1227
1228                 if (item->matching &&
1229                     (matching_refs == -1 || item->force)) {
1230                         matching_refs = i;
1231                         continue;
1232                 }
1233
1234                 if (item->pattern) {
1235                         const char *dst_side = item->dst ? item->dst : item->src;
1236                         int match;
1237                         if (direction == FROM_SRC)
1238                                 match = match_name_with_pattern(item->src, ref->name, dst_side, &name);
1239                         else
1240                                 match = match_name_with_pattern(dst_side, ref->name, item->src, &name);
1241                         if (match) {
1242                                 matching_refs = i;
1243                                 break;
1244                         }
1245                 }
1246         }
1247         if (matching_refs == -1)
1248                 return NULL;
1249
1250         pat = &rs->items[matching_refs];
1251         if (pat->matching) {
1252                 /*
1253                  * "matching refs"; traditionally we pushed everything
1254                  * including refs outside refs/heads/ hierarchy, but
1255                  * that does not make much sense these days.
1256                  */
1257                 if (!send_mirror && !starts_with(ref->name, "refs/heads/"))
1258                         return NULL;
1259                 name = xstrdup(ref->name);
1260         }
1261         if (ret_pat)
1262                 *ret_pat = pat;
1263         return name;
1264 }
1265
1266 static struct ref **tail_ref(struct ref **head)
1267 {
1268         struct ref **tail = head;
1269         while (*tail)
1270                 tail = &((*tail)->next);
1271         return tail;
1272 }
1273
1274 struct tips {
1275         struct commit **tip;
1276         int nr, alloc;
1277 };
1278
1279 static void add_to_tips(struct tips *tips, const struct object_id *oid)
1280 {
1281         struct commit *commit;
1282
1283         if (is_null_oid(oid))
1284                 return;
1285         commit = lookup_commit_reference_gently(the_repository, oid, 1);
1286         if (!commit || (commit->object.flags & TMP_MARK))
1287                 return;
1288         commit->object.flags |= TMP_MARK;
1289         ALLOC_GROW(tips->tip, tips->nr + 1, tips->alloc);
1290         tips->tip[tips->nr++] = commit;
1291 }
1292
1293 static void add_missing_tags(struct ref *src, struct ref **dst, struct ref ***dst_tail)
1294 {
1295         struct string_list dst_tag = STRING_LIST_INIT_NODUP;
1296         struct string_list src_tag = STRING_LIST_INIT_NODUP;
1297         struct string_list_item *item;
1298         struct ref *ref;
1299         struct tips sent_tips;
1300
1301         /*
1302          * Collect everything we know they would have at the end of
1303          * this push, and collect all tags they have.
1304          */
1305         memset(&sent_tips, 0, sizeof(sent_tips));
1306         for (ref = *dst; ref; ref = ref->next) {
1307                 if (ref->peer_ref &&
1308                     !is_null_oid(&ref->peer_ref->new_oid))
1309                         add_to_tips(&sent_tips, &ref->peer_ref->new_oid);
1310                 else
1311                         add_to_tips(&sent_tips, &ref->old_oid);
1312                 if (starts_with(ref->name, "refs/tags/"))
1313                         string_list_append(&dst_tag, ref->name);
1314         }
1315         clear_commit_marks_many(sent_tips.nr, sent_tips.tip, TMP_MARK);
1316
1317         string_list_sort(&dst_tag);
1318
1319         /* Collect tags they do not have. */
1320         for (ref = src; ref; ref = ref->next) {
1321                 if (!starts_with(ref->name, "refs/tags/"))
1322                         continue; /* not a tag */
1323                 if (string_list_has_string(&dst_tag, ref->name))
1324                         continue; /* they already have it */
1325                 if (oid_object_info(the_repository, &ref->new_oid, NULL) != OBJ_TAG)
1326                         continue; /* be conservative */
1327                 item = string_list_append(&src_tag, ref->name);
1328                 item->util = ref;
1329         }
1330         string_list_clear(&dst_tag, 0);
1331
1332         /*
1333          * At this point, src_tag lists tags that are missing from
1334          * dst, and sent_tips lists the tips we are pushing or those
1335          * that we know they already have. An element in the src_tag
1336          * that is an ancestor of any of the sent_tips needs to be
1337          * sent to the other side.
1338          */
1339         if (sent_tips.nr) {
1340                 const int reachable_flag = 1;
1341                 struct commit_list *found_commits;
1342                 struct commit **src_commits;
1343                 int nr_src_commits = 0, alloc_src_commits = 16;
1344                 ALLOC_ARRAY(src_commits, alloc_src_commits);
1345
1346                 for_each_string_list_item(item, &src_tag) {
1347                         struct ref *ref = item->util;
1348                         struct commit *commit;
1349
1350                         if (is_null_oid(&ref->new_oid))
1351                                 continue;
1352                         commit = lookup_commit_reference_gently(the_repository,
1353                                                                 &ref->new_oid,
1354                                                                 1);
1355                         if (!commit)
1356                                 /* not pushing a commit, which is not an error */
1357                                 continue;
1358
1359                         ALLOC_GROW(src_commits, nr_src_commits + 1, alloc_src_commits);
1360                         src_commits[nr_src_commits++] = commit;
1361                 }
1362
1363                 found_commits = get_reachable_subset(sent_tips.tip, sent_tips.nr,
1364                                                      src_commits, nr_src_commits,
1365                                                      reachable_flag);
1366
1367                 for_each_string_list_item(item, &src_tag) {
1368                         struct ref *dst_ref;
1369                         struct ref *ref = item->util;
1370                         struct commit *commit;
1371
1372                         if (is_null_oid(&ref->new_oid))
1373                                 continue;
1374                         commit = lookup_commit_reference_gently(the_repository,
1375                                                                 &ref->new_oid,
1376                                                                 1);
1377                         if (!commit)
1378                                 /* not pushing a commit, which is not an error */
1379                                 continue;
1380
1381                         /*
1382                          * Is this tag, which they do not have, reachable from
1383                          * any of the commits we are sending?
1384                          */
1385                         if (!(commit->object.flags & reachable_flag))
1386                                 continue;
1387
1388                         /* Add it in */
1389                         dst_ref = make_linked_ref(ref->name, dst_tail);
1390                         oidcpy(&dst_ref->new_oid, &ref->new_oid);
1391                         dst_ref->peer_ref = copy_ref(ref);
1392                 }
1393
1394                 clear_commit_marks_many(nr_src_commits, src_commits, reachable_flag);
1395                 free(src_commits);
1396                 free_commit_list(found_commits);
1397         }
1398
1399         string_list_clear(&src_tag, 0);
1400         free(sent_tips.tip);
1401 }
1402
1403 struct ref *find_ref_by_name(const struct ref *list, const char *name)
1404 {
1405         for ( ; list; list = list->next)
1406                 if (!strcmp(list->name, name))
1407                         return (struct ref *)list;
1408         return NULL;
1409 }
1410
1411 static void prepare_ref_index(struct string_list *ref_index, struct ref *ref)
1412 {
1413         for ( ; ref; ref = ref->next)
1414                 string_list_append_nodup(ref_index, ref->name)->util = ref;
1415
1416         string_list_sort(ref_index);
1417 }
1418
1419 /*
1420  * Given only the set of local refs, sanity-check the set of push
1421  * refspecs. We can't catch all errors that match_push_refs would,
1422  * but we can catch some errors early before even talking to the
1423  * remote side.
1424  */
1425 int check_push_refs(struct ref *src, struct refspec *rs)
1426 {
1427         int ret = 0;
1428         int i;
1429
1430         for (i = 0; i < rs->nr; i++) {
1431                 struct refspec_item *item = &rs->items[i];
1432
1433                 if (item->pattern || item->matching || item->negative)
1434                         continue;
1435
1436                 ret |= match_explicit_lhs(src, item, NULL, NULL);
1437         }
1438
1439         return ret;
1440 }
1441
1442 /*
1443  * Given the set of refs the local repository has, the set of refs the
1444  * remote repository has, and the refspec used for push, determine
1445  * what remote refs we will update and with what value by setting
1446  * peer_ref (which object is being pushed) and force (if the push is
1447  * forced) in elements of "dst". The function may add new elements to
1448  * dst (e.g. pushing to a new branch, done in match_explicit_refs).
1449  */
1450 int match_push_refs(struct ref *src, struct ref **dst,
1451                     struct refspec *rs, int flags)
1452 {
1453         int send_all = flags & MATCH_REFS_ALL;
1454         int send_mirror = flags & MATCH_REFS_MIRROR;
1455         int send_prune = flags & MATCH_REFS_PRUNE;
1456         int errs;
1457         struct ref *ref, **dst_tail = tail_ref(dst);
1458         struct string_list dst_ref_index = STRING_LIST_INIT_NODUP;
1459
1460         /* If no refspec is provided, use the default ":" */
1461         if (!rs->nr)
1462                 refspec_append(rs, ":");
1463
1464         errs = match_explicit_refs(src, *dst, &dst_tail, rs);
1465
1466         /* pick the remainder */
1467         for (ref = src; ref; ref = ref->next) {
1468                 struct string_list_item *dst_item;
1469                 struct ref *dst_peer;
1470                 const struct refspec_item *pat = NULL;
1471                 char *dst_name;
1472
1473                 dst_name = get_ref_match(rs, ref, send_mirror, FROM_SRC, &pat);
1474                 if (!dst_name)
1475                         continue;
1476
1477                 if (!dst_ref_index.nr)
1478                         prepare_ref_index(&dst_ref_index, *dst);
1479
1480                 dst_item = string_list_lookup(&dst_ref_index, dst_name);
1481                 dst_peer = dst_item ? dst_item->util : NULL;
1482                 if (dst_peer) {
1483                         if (dst_peer->peer_ref)
1484                                 /* We're already sending something to this ref. */
1485                                 goto free_name;
1486                 } else {
1487                         if (pat->matching && !(send_all || send_mirror))
1488                                 /*
1489                                  * Remote doesn't have it, and we have no
1490                                  * explicit pattern, and we don't have
1491                                  * --all or --mirror.
1492                                  */
1493                                 goto free_name;
1494
1495                         /* Create a new one and link it */
1496                         dst_peer = make_linked_ref(dst_name, &dst_tail);
1497                         oidcpy(&dst_peer->new_oid, &ref->new_oid);
1498                         string_list_insert(&dst_ref_index,
1499                                 dst_peer->name)->util = dst_peer;
1500                 }
1501                 dst_peer->peer_ref = copy_ref(ref);
1502                 dst_peer->force = pat->force;
1503         free_name:
1504                 free(dst_name);
1505         }
1506
1507         string_list_clear(&dst_ref_index, 0);
1508
1509         if (flags & MATCH_REFS_FOLLOW_TAGS)
1510                 add_missing_tags(src, dst, &dst_tail);
1511
1512         if (send_prune) {
1513                 struct string_list src_ref_index = STRING_LIST_INIT_NODUP;
1514                 /* check for missing refs on the remote */
1515                 for (ref = *dst; ref; ref = ref->next) {
1516                         char *src_name;
1517
1518                         if (ref->peer_ref)
1519                                 /* We're already sending something to this ref. */
1520                                 continue;
1521
1522                         src_name = get_ref_match(rs, ref, send_mirror, FROM_DST, NULL);
1523                         if (src_name) {
1524                                 if (!src_ref_index.nr)
1525                                         prepare_ref_index(&src_ref_index, src);
1526                                 if (!string_list_has_string(&src_ref_index,
1527                                             src_name))
1528                                         ref->peer_ref = alloc_delete_ref();
1529                                 free(src_name);
1530                         }
1531                 }
1532                 string_list_clear(&src_ref_index, 0);
1533         }
1534
1535         *dst = apply_negative_refspecs(*dst, rs);
1536
1537         if (errs)
1538                 return -1;
1539         return 0;
1540 }
1541
1542 void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
1543                              int force_update)
1544 {
1545         struct ref *ref;
1546
1547         for (ref = remote_refs; ref; ref = ref->next) {
1548                 int force_ref_update = ref->force || force_update;
1549                 int reject_reason = 0;
1550
1551                 if (ref->peer_ref)
1552                         oidcpy(&ref->new_oid, &ref->peer_ref->new_oid);
1553                 else if (!send_mirror)
1554                         continue;
1555
1556                 ref->deletion = is_null_oid(&ref->new_oid);
1557                 if (!ref->deletion &&
1558                         oideq(&ref->old_oid, &ref->new_oid)) {
1559                         ref->status = REF_STATUS_UPTODATE;
1560                         continue;
1561                 }
1562
1563                 /*
1564                  * If the remote ref has moved and is now different
1565                  * from what we expect, reject any push.
1566                  *
1567                  * It also is an error if the user told us to check
1568                  * with the remote-tracking branch to find the value
1569                  * to expect, but we did not have such a tracking
1570                  * branch.
1571                  *
1572                  * If the tip of the remote-tracking ref is unreachable
1573                  * from any reflog entry of its local ref indicating a
1574                  * possible update since checkout; reject the push.
1575                  */
1576                 if (ref->expect_old_sha1) {
1577                         if (!oideq(&ref->old_oid, &ref->old_oid_expect))
1578                                 reject_reason = REF_STATUS_REJECT_STALE;
1579                         else if (ref->check_reachable && ref->unreachable)
1580                                 reject_reason =
1581                                         REF_STATUS_REJECT_REMOTE_UPDATED;
1582                         else
1583                                 /*
1584                                  * If the ref isn't stale, and is reachable
1585                                  * from from one of the reflog entries of
1586                                  * the local branch, force the update.
1587                                  */
1588                                 force_ref_update = 1;
1589                 }
1590
1591                 /*
1592                  * If the update isn't already rejected then check
1593                  * the usual "must fast-forward" rules.
1594                  *
1595                  * Decide whether an individual refspec A:B can be
1596                  * pushed.  The push will succeed if any of the
1597                  * following are true:
1598                  *
1599                  * (1) the remote reference B does not exist
1600                  *
1601                  * (2) the remote reference B is being removed (i.e.,
1602                  *     pushing :B where no source is specified)
1603                  *
1604                  * (3) the destination is not under refs/tags/, and
1605                  *     if the old and new value is a commit, the new
1606                  *     is a descendant of the old.
1607                  *
1608                  * (4) it is forced using the +A:B notation, or by
1609                  *     passing the --force argument
1610                  */
1611
1612                 if (!reject_reason && !ref->deletion && !is_null_oid(&ref->old_oid)) {
1613                         if (starts_with(ref->name, "refs/tags/"))
1614                                 reject_reason = REF_STATUS_REJECT_ALREADY_EXISTS;
1615                         else if (!has_object_file(&ref->old_oid))
1616                                 reject_reason = REF_STATUS_REJECT_FETCH_FIRST;
1617                         else if (!lookup_commit_reference_gently(the_repository, &ref->old_oid, 1) ||
1618                                  !lookup_commit_reference_gently(the_repository, &ref->new_oid, 1))
1619                                 reject_reason = REF_STATUS_REJECT_NEEDS_FORCE;
1620                         else if (!ref_newer(&ref->new_oid, &ref->old_oid))
1621                                 reject_reason = REF_STATUS_REJECT_NONFASTFORWARD;
1622                 }
1623
1624                 /*
1625                  * "--force" will defeat any rejection implemented
1626                  * by the rules above.
1627                  */
1628                 if (!force_ref_update)
1629                         ref->status = reject_reason;
1630                 else if (reject_reason)
1631                         ref->forced_update = 1;
1632         }
1633 }
1634
1635 static void set_merge(struct branch *ret)
1636 {
1637         struct remote *remote;
1638         char *ref;
1639         struct object_id oid;
1640         int i;
1641
1642         if (!ret)
1643                 return; /* no branch */
1644         if (ret->merge)
1645                 return; /* already run */
1646         if (!ret->remote_name || !ret->merge_nr) {
1647                 /*
1648                  * no merge config; let's make sure we don't confuse callers
1649                  * with a non-zero merge_nr but a NULL merge
1650                  */
1651                 ret->merge_nr = 0;
1652                 return;
1653         }
1654
1655         remote = remote_get(ret->remote_name);
1656
1657         ret->merge = xcalloc(ret->merge_nr, sizeof(*ret->merge));
1658         for (i = 0; i < ret->merge_nr; i++) {
1659                 ret->merge[i] = xcalloc(1, sizeof(**ret->merge));
1660                 ret->merge[i]->src = xstrdup(ret->merge_name[i]);
1661                 if (!remote_find_tracking(remote, ret->merge[i]) ||
1662                     strcmp(ret->remote_name, "."))
1663                         continue;
1664                 if (dwim_ref(ret->merge_name[i], strlen(ret->merge_name[i]),
1665                              &oid, &ref, 0) == 1)
1666                         ret->merge[i]->dst = ref;
1667                 else
1668                         ret->merge[i]->dst = xstrdup(ret->merge_name[i]);
1669         }
1670 }
1671
1672 struct branch *branch_get(const char *name)
1673 {
1674         struct branch *ret;
1675
1676         read_config();
1677         if (!name || !*name || !strcmp(name, "HEAD"))
1678                 ret = current_branch;
1679         else
1680                 ret = make_branch(name, strlen(name));
1681         set_merge(ret);
1682         return ret;
1683 }
1684
1685 int branch_has_merge_config(struct branch *branch)
1686 {
1687         return branch && !!branch->merge;
1688 }
1689
1690 int branch_merge_matches(struct branch *branch,
1691                                  int i,
1692                                  const char *refname)
1693 {
1694         if (!branch || i < 0 || i >= branch->merge_nr)
1695                 return 0;
1696         return refname_match(branch->merge[i]->src, refname);
1697 }
1698
1699 __attribute__((format (printf,2,3)))
1700 static const char *error_buf(struct strbuf *err, const char *fmt, ...)
1701 {
1702         if (err) {
1703                 va_list ap;
1704                 va_start(ap, fmt);
1705                 strbuf_vaddf(err, fmt, ap);
1706                 va_end(ap);
1707         }
1708         return NULL;
1709 }
1710
1711 const char *branch_get_upstream(struct branch *branch, struct strbuf *err)
1712 {
1713         if (!branch)
1714                 return error_buf(err, _("HEAD does not point to a branch"));
1715
1716         if (!branch->merge || !branch->merge[0]) {
1717                 /*
1718                  * no merge config; is it because the user didn't define any,
1719                  * or because it is not a real branch, and get_branch
1720                  * auto-vivified it?
1721                  */
1722                 if (!ref_exists(branch->refname))
1723                         return error_buf(err, _("no such branch: '%s'"),
1724                                          branch->name);
1725                 return error_buf(err,
1726                                  _("no upstream configured for branch '%s'"),
1727                                  branch->name);
1728         }
1729
1730         if (!branch->merge[0]->dst)
1731                 return error_buf(err,
1732                                  _("upstream branch '%s' not stored as a remote-tracking branch"),
1733                                  branch->merge[0]->src);
1734
1735         return branch->merge[0]->dst;
1736 }
1737
1738 static const char *tracking_for_push_dest(struct remote *remote,
1739                                           const char *refname,
1740                                           struct strbuf *err)
1741 {
1742         char *ret;
1743
1744         ret = apply_refspecs(&remote->fetch, refname);
1745         if (!ret)
1746                 return error_buf(err,
1747                                  _("push destination '%s' on remote '%s' has no local tracking branch"),
1748                                  refname, remote->name);
1749         return ret;
1750 }
1751
1752 static const char *branch_get_push_1(struct branch *branch, struct strbuf *err)
1753 {
1754         struct remote *remote;
1755
1756         remote = remote_get(pushremote_for_branch(branch, NULL));
1757         if (!remote)
1758                 return error_buf(err,
1759                                  _("branch '%s' has no remote for pushing"),
1760                                  branch->name);
1761
1762         if (remote->push.nr) {
1763                 char *dst;
1764                 const char *ret;
1765
1766                 dst = apply_refspecs(&remote->push, branch->refname);
1767                 if (!dst)
1768                         return error_buf(err,
1769                                          _("push refspecs for '%s' do not include '%s'"),
1770                                          remote->name, branch->name);
1771
1772                 ret = tracking_for_push_dest(remote, dst, err);
1773                 free(dst);
1774                 return ret;
1775         }
1776
1777         if (remote->mirror)
1778                 return tracking_for_push_dest(remote, branch->refname, err);
1779
1780         switch (push_default) {
1781         case PUSH_DEFAULT_NOTHING:
1782                 return error_buf(err, _("push has no destination (push.default is 'nothing')"));
1783
1784         case PUSH_DEFAULT_MATCHING:
1785         case PUSH_DEFAULT_CURRENT:
1786                 return tracking_for_push_dest(remote, branch->refname, err);
1787
1788         case PUSH_DEFAULT_UPSTREAM:
1789                 return branch_get_upstream(branch, err);
1790
1791         case PUSH_DEFAULT_UNSPECIFIED:
1792         case PUSH_DEFAULT_SIMPLE:
1793                 {
1794                         const char *up, *cur;
1795
1796                         up = branch_get_upstream(branch, err);
1797                         if (!up)
1798                                 return NULL;
1799                         cur = tracking_for_push_dest(remote, branch->refname, err);
1800                         if (!cur)
1801                                 return NULL;
1802                         if (strcmp(cur, up))
1803                                 return error_buf(err,
1804                                                  _("cannot resolve 'simple' push to a single destination"));
1805                         return cur;
1806                 }
1807         }
1808
1809         BUG("unhandled push situation");
1810 }
1811
1812 const char *branch_get_push(struct branch *branch, struct strbuf *err)
1813 {
1814         if (!branch)
1815                 return error_buf(err, _("HEAD does not point to a branch"));
1816
1817         if (!branch->push_tracking_ref)
1818                 branch->push_tracking_ref = branch_get_push_1(branch, err);
1819         return branch->push_tracking_ref;
1820 }
1821
1822 static int ignore_symref_update(const char *refname)
1823 {
1824         int flag;
1825
1826         if (!resolve_ref_unsafe(refname, 0, NULL, &flag))
1827                 return 0; /* non-existing refs are OK */
1828         return (flag & REF_ISSYMREF);
1829 }
1830
1831 /*
1832  * Create and return a list of (struct ref) consisting of copies of
1833  * each remote_ref that matches refspec.  refspec must be a pattern.
1834  * Fill in the copies' peer_ref to describe the local tracking refs to
1835  * which they map.  Omit any references that would map to an existing
1836  * local symbolic ref.
1837  */
1838 static struct ref *get_expanded_map(const struct ref *remote_refs,
1839                                     const struct refspec_item *refspec)
1840 {
1841         const struct ref *ref;
1842         struct ref *ret = NULL;
1843         struct ref **tail = &ret;
1844
1845         for (ref = remote_refs; ref; ref = ref->next) {
1846                 char *expn_name = NULL;
1847
1848                 if (strchr(ref->name, '^'))
1849                         continue; /* a dereference item */
1850                 if (match_name_with_pattern(refspec->src, ref->name,
1851                                             refspec->dst, &expn_name) &&
1852                     !ignore_symref_update(expn_name)) {
1853                         struct ref *cpy = copy_ref(ref);
1854
1855                         cpy->peer_ref = alloc_ref(expn_name);
1856                         if (refspec->force)
1857                                 cpy->peer_ref->force = 1;
1858                         *tail = cpy;
1859                         tail = &cpy->next;
1860                 }
1861                 free(expn_name);
1862         }
1863
1864         return ret;
1865 }
1866
1867 static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
1868 {
1869         const struct ref *ref;
1870         const struct ref *best_match = NULL;
1871         int best_score = 0;
1872
1873         for (ref = refs; ref; ref = ref->next) {
1874                 int score = refname_match(name, ref->name);
1875
1876                 if (best_score < score) {
1877                         best_match = ref;
1878                         best_score = score;
1879                 }
1880         }
1881         return best_match;
1882 }
1883
1884 struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
1885 {
1886         const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
1887
1888         if (!ref)
1889                 return NULL;
1890
1891         return copy_ref(ref);
1892 }
1893
1894 static struct ref *get_local_ref(const char *name)
1895 {
1896         if (!name || name[0] == '\0')
1897                 return NULL;
1898
1899         if (starts_with(name, "refs/"))
1900                 return alloc_ref(name);
1901
1902         if (starts_with(name, "heads/") ||
1903             starts_with(name, "tags/") ||
1904             starts_with(name, "remotes/"))
1905                 return alloc_ref_with_prefix("refs/", 5, name);
1906
1907         return alloc_ref_with_prefix("refs/heads/", 11, name);
1908 }
1909
1910 int get_fetch_map(const struct ref *remote_refs,
1911                   const struct refspec_item *refspec,
1912                   struct ref ***tail,
1913                   int missing_ok)
1914 {
1915         struct ref *ref_map, **rmp;
1916
1917         if (refspec->negative)
1918                 return 0;
1919
1920         if (refspec->pattern) {
1921                 ref_map = get_expanded_map(remote_refs, refspec);
1922         } else {
1923                 const char *name = refspec->src[0] ? refspec->src : "HEAD";
1924
1925                 if (refspec->exact_sha1) {
1926                         ref_map = alloc_ref(name);
1927                         get_oid_hex(name, &ref_map->old_oid);
1928                         ref_map->exact_oid = 1;
1929                 } else {
1930                         ref_map = get_remote_ref(remote_refs, name);
1931                 }
1932                 if (!missing_ok && !ref_map)
1933                         die(_("couldn't find remote ref %s"), name);
1934                 if (ref_map) {
1935                         ref_map->peer_ref = get_local_ref(refspec->dst);
1936                         if (ref_map->peer_ref && refspec->force)
1937                                 ref_map->peer_ref->force = 1;
1938                 }
1939         }
1940
1941         for (rmp = &ref_map; *rmp; ) {
1942                 if ((*rmp)->peer_ref) {
1943                         if (!starts_with((*rmp)->peer_ref->name, "refs/") ||
1944                             check_refname_format((*rmp)->peer_ref->name, 0)) {
1945                                 struct ref *ignore = *rmp;
1946                                 error(_("* Ignoring funny ref '%s' locally"),
1947                                       (*rmp)->peer_ref->name);
1948                                 *rmp = (*rmp)->next;
1949                                 free(ignore->peer_ref);
1950                                 free(ignore);
1951                                 continue;
1952                         }
1953                 }
1954                 rmp = &((*rmp)->next);
1955         }
1956
1957         if (ref_map)
1958                 tail_link_ref(ref_map, tail);
1959
1960         return 0;
1961 }
1962
1963 int resolve_remote_symref(struct ref *ref, struct ref *list)
1964 {
1965         if (!ref->symref)
1966                 return 0;
1967         for (; list; list = list->next)
1968                 if (!strcmp(ref->symref, list->name)) {
1969                         oidcpy(&ref->old_oid, &list->old_oid);
1970                         return 0;
1971                 }
1972         return 1;
1973 }
1974
1975 /*
1976  * Compute the commit ahead/behind values for the pair branch_name, base.
1977  *
1978  * If abf is AHEAD_BEHIND_FULL, compute the full ahead/behind and return the
1979  * counts in *num_ours and *num_theirs.  If abf is AHEAD_BEHIND_QUICK, skip
1980  * the (potentially expensive) a/b computation (*num_ours and *num_theirs are
1981  * set to zero).
1982  *
1983  * Returns -1 if num_ours and num_theirs could not be filled in (e.g., ref
1984  * does not exist).  Returns 0 if the commits are identical.  Returns 1 if
1985  * commits are different.
1986  */
1987
1988 static int stat_branch_pair(const char *branch_name, const char *base,
1989                              int *num_ours, int *num_theirs,
1990                              enum ahead_behind_flags abf)
1991 {
1992         struct object_id oid;
1993         struct commit *ours, *theirs;
1994         struct rev_info revs;
1995         struct strvec argv = STRVEC_INIT;
1996
1997         /* Cannot stat if what we used to build on no longer exists */
1998         if (read_ref(base, &oid))
1999                 return -1;
2000         theirs = lookup_commit_reference(the_repository, &oid);
2001         if (!theirs)
2002                 return -1;
2003
2004         if (read_ref(branch_name, &oid))
2005                 return -1;
2006         ours = lookup_commit_reference(the_repository, &oid);
2007         if (!ours)
2008                 return -1;
2009
2010         *num_theirs = *num_ours = 0;
2011
2012         /* are we the same? */
2013         if (theirs == ours)
2014                 return 0;
2015         if (abf == AHEAD_BEHIND_QUICK)
2016                 return 1;
2017         if (abf != AHEAD_BEHIND_FULL)
2018                 BUG("stat_branch_pair: invalid abf '%d'", abf);
2019
2020         /* Run "rev-list --left-right ours...theirs" internally... */
2021         strvec_push(&argv, ""); /* ignored */
2022         strvec_push(&argv, "--left-right");
2023         strvec_pushf(&argv, "%s...%s",
2024                      oid_to_hex(&ours->object.oid),
2025                      oid_to_hex(&theirs->object.oid));
2026         strvec_push(&argv, "--");
2027
2028         repo_init_revisions(the_repository, &revs, NULL);
2029         setup_revisions(argv.nr, argv.v, &revs, NULL);
2030         if (prepare_revision_walk(&revs))
2031                 die(_("revision walk setup failed"));
2032
2033         /* ... and count the commits on each side. */
2034         while (1) {
2035                 struct commit *c = get_revision(&revs);
2036                 if (!c)
2037                         break;
2038                 if (c->object.flags & SYMMETRIC_LEFT)
2039                         (*num_ours)++;
2040                 else
2041                         (*num_theirs)++;
2042         }
2043
2044         /* clear object flags smudged by the above traversal */
2045         clear_commit_marks(ours, ALL_REV_FLAGS);
2046         clear_commit_marks(theirs, ALL_REV_FLAGS);
2047
2048         strvec_clear(&argv);
2049         return 1;
2050 }
2051
2052 /*
2053  * Lookup the tracking branch for the given branch and if present, optionally
2054  * compute the commit ahead/behind values for the pair.
2055  *
2056  * If for_push is true, the tracking branch refers to the push branch,
2057  * otherwise it refers to the upstream branch.
2058  *
2059  * The name of the tracking branch (or NULL if it is not defined) is
2060  * returned via *tracking_name, if it is not itself NULL.
2061  *
2062  * If abf is AHEAD_BEHIND_FULL, compute the full ahead/behind and return the
2063  * counts in *num_ours and *num_theirs.  If abf is AHEAD_BEHIND_QUICK, skip
2064  * the (potentially expensive) a/b computation (*num_ours and *num_theirs are
2065  * set to zero).
2066  *
2067  * Returns -1 if num_ours and num_theirs could not be filled in (e.g., no
2068  * upstream defined, or ref does not exist).  Returns 0 if the commits are
2069  * identical.  Returns 1 if commits are different.
2070  */
2071 int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs,
2072                        const char **tracking_name, int for_push,
2073                        enum ahead_behind_flags abf)
2074 {
2075         const char *base;
2076
2077         /* Cannot stat unless we are marked to build on top of somebody else. */
2078         base = for_push ? branch_get_push(branch, NULL) :
2079                 branch_get_upstream(branch, NULL);
2080         if (tracking_name)
2081                 *tracking_name = base;
2082         if (!base)
2083                 return -1;
2084
2085         return stat_branch_pair(branch->refname, base, num_ours, num_theirs, abf);
2086 }
2087
2088 /*
2089  * Return true when there is anything to report, otherwise false.
2090  */
2091 int format_tracking_info(struct branch *branch, struct strbuf *sb,
2092                          enum ahead_behind_flags abf)
2093 {
2094         int ours, theirs, sti;
2095         const char *full_base;
2096         char *base;
2097         int upstream_is_gone = 0;
2098
2099         sti = stat_tracking_info(branch, &ours, &theirs, &full_base, 0, abf);
2100         if (sti < 0) {
2101                 if (!full_base)
2102                         return 0;
2103                 upstream_is_gone = 1;
2104         }
2105
2106         base = shorten_unambiguous_ref(full_base, 0);
2107         if (upstream_is_gone) {
2108                 strbuf_addf(sb,
2109                         _("Your branch is based on '%s', but the upstream is gone.\n"),
2110                         base);
2111                 if (advice_status_hints)
2112                         strbuf_addstr(sb,
2113                                 _("  (use \"git branch --unset-upstream\" to fixup)\n"));
2114         } else if (!sti) {
2115                 strbuf_addf(sb,
2116                         _("Your branch is up to date with '%s'.\n"),
2117                         base);
2118         } else if (abf == AHEAD_BEHIND_QUICK) {
2119                 strbuf_addf(sb,
2120                             _("Your branch and '%s' refer to different commits.\n"),
2121                             base);
2122                 if (advice_status_hints)
2123                         strbuf_addf(sb, _("  (use \"%s\" for details)\n"),
2124                                     "git status --ahead-behind");
2125         } else if (!theirs) {
2126                 strbuf_addf(sb,
2127                         Q_("Your branch is ahead of '%s' by %d commit.\n",
2128                            "Your branch is ahead of '%s' by %d commits.\n",
2129                            ours),
2130                         base, ours);
2131                 if (advice_status_hints)
2132                         strbuf_addstr(sb,
2133                                 _("  (use \"git push\" to publish your local commits)\n"));
2134         } else if (!ours) {
2135                 strbuf_addf(sb,
2136                         Q_("Your branch is behind '%s' by %d commit, "
2137                                "and can be fast-forwarded.\n",
2138                            "Your branch is behind '%s' by %d commits, "
2139                                "and can be fast-forwarded.\n",
2140                            theirs),
2141                         base, theirs);
2142                 if (advice_status_hints)
2143                         strbuf_addstr(sb,
2144                                 _("  (use \"git pull\" to update your local branch)\n"));
2145         } else {
2146                 strbuf_addf(sb,
2147                         Q_("Your branch and '%s' have diverged,\n"
2148                                "and have %d and %d different commit each, "
2149                                "respectively.\n",
2150                            "Your branch and '%s' have diverged,\n"
2151                                "and have %d and %d different commits each, "
2152                                "respectively.\n",
2153                            ours + theirs),
2154                         base, ours, theirs);
2155                 if (advice_status_hints)
2156                         strbuf_addstr(sb,
2157                                 _("  (use \"git pull\" to merge the remote branch into yours)\n"));
2158         }
2159         free(base);
2160         return 1;
2161 }
2162
2163 static int one_local_ref(const char *refname, const struct object_id *oid,
2164                          int flag, void *cb_data)
2165 {
2166         struct ref ***local_tail = cb_data;
2167         struct ref *ref;
2168
2169         /* we already know it starts with refs/ to get here */
2170         if (check_refname_format(refname + 5, 0))
2171                 return 0;
2172
2173         ref = alloc_ref(refname);
2174         oidcpy(&ref->new_oid, oid);
2175         **local_tail = ref;
2176         *local_tail = &ref->next;
2177         return 0;
2178 }
2179
2180 struct ref *get_local_heads(void)
2181 {
2182         struct ref *local_refs = NULL, **local_tail = &local_refs;
2183
2184         for_each_ref(one_local_ref, &local_tail);
2185         return local_refs;
2186 }
2187
2188 struct ref *guess_remote_head(const struct ref *head,
2189                               const struct ref *refs,
2190                               int all)
2191 {
2192         const struct ref *r;
2193         struct ref *list = NULL;
2194         struct ref **tail = &list;
2195
2196         if (!head)
2197                 return NULL;
2198
2199         /*
2200          * Some transports support directly peeking at
2201          * where HEAD points; if that is the case, then
2202          * we don't have to guess.
2203          */
2204         if (head->symref)
2205                 return copy_ref(find_ref_by_name(refs, head->symref));
2206
2207         /* If a remote branch exists with the default branch name, let's use it. */
2208         if (!all) {
2209                 char *ref = xstrfmt("refs/heads/%s", git_default_branch_name());
2210
2211                 r = find_ref_by_name(refs, ref);
2212                 free(ref);
2213                 if (r && oideq(&r->old_oid, &head->old_oid))
2214                         return copy_ref(r);
2215
2216                 /* Fall back to the hard-coded historical default */
2217                 r = find_ref_by_name(refs, "refs/heads/master");
2218                 if (r && oideq(&r->old_oid, &head->old_oid))
2219                         return copy_ref(r);
2220         }
2221
2222         /* Look for another ref that points there */
2223         for (r = refs; r; r = r->next) {
2224                 if (r != head &&
2225                     starts_with(r->name, "refs/heads/") &&
2226                     oideq(&r->old_oid, &head->old_oid)) {
2227                         *tail = copy_ref(r);
2228                         tail = &((*tail)->next);
2229                         if (!all)
2230                                 break;
2231                 }
2232         }
2233
2234         return list;
2235 }
2236
2237 struct stale_heads_info {
2238         struct string_list *ref_names;
2239         struct ref **stale_refs_tail;
2240         struct refspec *rs;
2241 };
2242
2243 static int get_stale_heads_cb(const char *refname, const struct object_id *oid,
2244                               int flags, void *cb_data)
2245 {
2246         struct stale_heads_info *info = cb_data;
2247         struct string_list matches = STRING_LIST_INIT_DUP;
2248         struct refspec_item query;
2249         int i, stale = 1;
2250         memset(&query, 0, sizeof(struct refspec_item));
2251         query.dst = (char *)refname;
2252
2253         query_refspecs_multiple(info->rs, &query, &matches);
2254         if (matches.nr == 0)
2255                 goto clean_exit; /* No matches */
2256
2257         /*
2258          * If we did find a suitable refspec and it's not a symref and
2259          * it's not in the list of refs that currently exist in that
2260          * remote, we consider it to be stale. In order to deal with
2261          * overlapping refspecs, we need to go over all of the
2262          * matching refs.
2263          */
2264         if (flags & REF_ISSYMREF)
2265                 goto clean_exit;
2266
2267         for (i = 0; stale && i < matches.nr; i++)
2268                 if (string_list_has_string(info->ref_names, matches.items[i].string))
2269                         stale = 0;
2270
2271         if (stale) {
2272                 struct ref *ref = make_linked_ref(refname, &info->stale_refs_tail);
2273                 oidcpy(&ref->new_oid, oid);
2274         }
2275
2276 clean_exit:
2277         string_list_clear(&matches, 0);
2278         return 0;
2279 }
2280
2281 struct ref *get_stale_heads(struct refspec *rs, struct ref *fetch_map)
2282 {
2283         struct ref *ref, *stale_refs = NULL;
2284         struct string_list ref_names = STRING_LIST_INIT_NODUP;
2285         struct stale_heads_info info;
2286
2287         info.ref_names = &ref_names;
2288         info.stale_refs_tail = &stale_refs;
2289         info.rs = rs;
2290         for (ref = fetch_map; ref; ref = ref->next)
2291                 string_list_append(&ref_names, ref->name);
2292         string_list_sort(&ref_names);
2293         for_each_ref(get_stale_heads_cb, &info);
2294         string_list_clear(&ref_names, 0);
2295         return stale_refs;
2296 }
2297
2298 /*
2299  * Compare-and-swap
2300  */
2301 static void clear_cas_option(struct push_cas_option *cas)
2302 {
2303         int i;
2304
2305         for (i = 0; i < cas->nr; i++)
2306                 free(cas->entry[i].refname);
2307         free(cas->entry);
2308         memset(cas, 0, sizeof(*cas));
2309 }
2310
2311 static struct push_cas *add_cas_entry(struct push_cas_option *cas,
2312                                       const char *refname,
2313                                       size_t refnamelen)
2314 {
2315         struct push_cas *entry;
2316         ALLOC_GROW(cas->entry, cas->nr + 1, cas->alloc);
2317         entry = &cas->entry[cas->nr++];
2318         memset(entry, 0, sizeof(*entry));
2319         entry->refname = xmemdupz(refname, refnamelen);
2320         return entry;
2321 }
2322
2323 static int parse_push_cas_option(struct push_cas_option *cas, const char *arg, int unset)
2324 {
2325         const char *colon;
2326         struct push_cas *entry;
2327
2328         if (unset) {
2329                 /* "--no-<option>" */
2330                 clear_cas_option(cas);
2331                 return 0;
2332         }
2333
2334         if (!arg) {
2335                 /* just "--<option>" */
2336                 cas->use_tracking_for_rest = 1;
2337                 return 0;
2338         }
2339
2340         /* "--<option>=refname" or "--<option>=refname:value" */
2341         colon = strchrnul(arg, ':');
2342         entry = add_cas_entry(cas, arg, colon - arg);
2343         if (!*colon)
2344                 entry->use_tracking = 1;
2345         else if (!colon[1])
2346                 oidclr(&entry->expect);
2347         else if (get_oid(colon + 1, &entry->expect))
2348                 return error(_("cannot parse expected object name '%s'"),
2349                              colon + 1);
2350         return 0;
2351 }
2352
2353 int parseopt_push_cas_option(const struct option *opt, const char *arg, int unset)
2354 {
2355         return parse_push_cas_option(opt->value, arg, unset);
2356 }
2357
2358 int is_empty_cas(const struct push_cas_option *cas)
2359 {
2360         return !cas->use_tracking_for_rest && !cas->nr;
2361 }
2362
2363 /*
2364  * Look at remote.fetch refspec and see if we have a remote
2365  * tracking branch for the refname there. Fill the name of
2366  * the remote-tracking branch in *dst_refname, and the name
2367  * of the commit object at its tip in oid[].
2368  * If we cannot do so, return negative to signal an error.
2369  */
2370 static int remote_tracking(struct remote *remote, const char *refname,
2371                            struct object_id *oid, char **dst_refname)
2372 {
2373         char *dst;
2374
2375         dst = apply_refspecs(&remote->fetch, refname);
2376         if (!dst)
2377                 return -1; /* no tracking ref for refname at remote */
2378         if (read_ref(dst, oid))
2379                 return -1; /* we know what the tracking ref is but we cannot read it */
2380
2381         *dst_refname = dst;
2382         return 0;
2383 }
2384
2385 /*
2386  * The struct "reflog_commit_array" and related helper functions
2387  * are used for collecting commits into an array during reflog
2388  * traversals in "check_and_collect_until()".
2389  */
2390 struct reflog_commit_array {
2391         struct commit **item;
2392         size_t nr, alloc;
2393 };
2394
2395 #define REFLOG_COMMIT_ARRAY_INIT { NULL, 0, 0 }
2396
2397 /* Append a commit to the array. */
2398 static void append_commit(struct reflog_commit_array *arr,
2399                           struct commit *commit)
2400 {
2401         ALLOC_GROW(arr->item, arr->nr + 1, arr->alloc);
2402         arr->item[arr->nr++] = commit;
2403 }
2404
2405 /* Free and reset the array. */
2406 static void free_commit_array(struct reflog_commit_array *arr)
2407 {
2408         FREE_AND_NULL(arr->item);
2409         arr->nr = arr->alloc = 0;
2410 }
2411
2412 struct check_and_collect_until_cb_data {
2413         struct commit *remote_commit;
2414         struct reflog_commit_array *local_commits;
2415         timestamp_t remote_reflog_timestamp;
2416 };
2417
2418 /* Get the timestamp of the latest entry. */
2419 static int peek_reflog(struct object_id *o_oid, struct object_id *n_oid,
2420                        const char *ident, timestamp_t timestamp,
2421                        int tz, const char *message, void *cb_data)
2422 {
2423         timestamp_t *ts = cb_data;
2424         *ts = timestamp;
2425         return 1;
2426 }
2427
2428 static int check_and_collect_until(struct object_id *o_oid,
2429                                    struct object_id *n_oid,
2430                                    const char *ident, timestamp_t timestamp,
2431                                    int tz, const char *message, void *cb_data)
2432 {
2433         struct commit *commit;
2434         struct check_and_collect_until_cb_data *cb = cb_data;
2435
2436         /* An entry was found. */
2437         if (oideq(n_oid, &cb->remote_commit->object.oid))
2438                 return 1;
2439
2440         if ((commit = lookup_commit_reference(the_repository, n_oid)))
2441                 append_commit(cb->local_commits, commit);
2442
2443         /*
2444          * If the reflog entry timestamp is older than the remote ref's
2445          * latest reflog entry, there is no need to check or collect
2446          * entries older than this one.
2447          */
2448         if (timestamp < cb->remote_reflog_timestamp)
2449                 return -1;
2450
2451         return 0;
2452 }
2453
2454 #define MERGE_BASES_BATCH_SIZE 8
2455
2456 /*
2457  * Iterate through the reflog of the local ref to check if there is an entry
2458  * for the given remote-tracking ref; runs until the timestamp of an entry is
2459  * older than latest timestamp of remote-tracking ref's reflog. Any commits
2460  * are that seen along the way are collected into an array to check if the
2461  * remote-tracking ref is reachable from any of them.
2462  */
2463 static int is_reachable_in_reflog(const char *local, const struct ref *remote)
2464 {
2465         timestamp_t date;
2466         struct commit *commit;
2467         struct commit **chunk;
2468         struct check_and_collect_until_cb_data cb;
2469         struct reflog_commit_array arr = REFLOG_COMMIT_ARRAY_INIT;
2470         size_t size = 0;
2471         int ret = 0;
2472
2473         commit = lookup_commit_reference(the_repository, &remote->old_oid);
2474         if (!commit)
2475                 goto cleanup_return;
2476
2477         /*
2478          * Get the timestamp from the latest entry
2479          * of the remote-tracking ref's reflog.
2480          */
2481         for_each_reflog_ent_reverse(remote->tracking_ref, peek_reflog, &date);
2482
2483         cb.remote_commit = commit;
2484         cb.local_commits = &arr;
2485         cb.remote_reflog_timestamp = date;
2486         ret = for_each_reflog_ent_reverse(local, check_and_collect_until, &cb);
2487
2488         /* We found an entry in the reflog. */
2489         if (ret > 0)
2490                 goto cleanup_return;
2491
2492         /*
2493          * Check if the remote commit is reachable from any
2494          * of the commits in the collected array, in batches.
2495          */
2496         for (chunk = arr.item; chunk < arr.item + arr.nr; chunk += size) {
2497                 size = arr.item + arr.nr - chunk;
2498                 if (MERGE_BASES_BATCH_SIZE < size)
2499                         size = MERGE_BASES_BATCH_SIZE;
2500
2501                 if ((ret = in_merge_bases_many(commit, size, chunk)))
2502                         break;
2503         }
2504
2505 cleanup_return:
2506         free_commit_array(&arr);
2507         return ret;
2508 }
2509
2510 /*
2511  * Check for reachability of a remote-tracking
2512  * ref in the reflog entries of its local ref.
2513  */
2514 static void check_if_includes_upstream(struct ref *remote)
2515 {
2516         struct ref *local = get_local_ref(remote->name);
2517         if (!local)
2518                 return;
2519
2520         if (is_reachable_in_reflog(local->name, remote) <= 0)
2521                 remote->unreachable = 1;
2522 }
2523
2524 static void apply_cas(struct push_cas_option *cas,
2525                       struct remote *remote,
2526                       struct ref *ref)
2527 {
2528         int i;
2529
2530         /* Find an explicit --<option>=<name>[:<value>] entry */
2531         for (i = 0; i < cas->nr; i++) {
2532                 struct push_cas *entry = &cas->entry[i];
2533                 if (!refname_match(entry->refname, ref->name))
2534                         continue;
2535                 ref->expect_old_sha1 = 1;
2536                 if (!entry->use_tracking)
2537                         oidcpy(&ref->old_oid_expect, &entry->expect);
2538                 else if (remote_tracking(remote, ref->name,
2539                                          &ref->old_oid_expect,
2540                                          &ref->tracking_ref))
2541                         oidclr(&ref->old_oid_expect);
2542                 else
2543                         ref->check_reachable = cas->use_force_if_includes;
2544                 return;
2545         }
2546
2547         /* Are we using "--<option>" to cover all? */
2548         if (!cas->use_tracking_for_rest)
2549                 return;
2550
2551         ref->expect_old_sha1 = 1;
2552         if (remote_tracking(remote, ref->name,
2553                             &ref->old_oid_expect,
2554                             &ref->tracking_ref))
2555                 oidclr(&ref->old_oid_expect);
2556         else
2557                 ref->check_reachable = cas->use_force_if_includes;
2558 }
2559
2560 void apply_push_cas(struct push_cas_option *cas,
2561                     struct remote *remote,
2562                     struct ref *remote_refs)
2563 {
2564         struct ref *ref;
2565         for (ref = remote_refs; ref; ref = ref->next) {
2566                 apply_cas(cas, remote, ref);
2567
2568                 /*
2569                  * If "compare-and-swap" is in "use_tracking[_for_rest]"
2570                  * mode, and if "--force-if-includes" was specified, run
2571                  * the check.
2572                  */
2573                 if (ref->check_reachable)
2574                         check_if_includes_upstream(ref);
2575         }
2576 }