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