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