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