🌐 AI搜索 & 代理 主页
blob: 8be67f0892b47d0f31f9f1579c80ad6420721a7b [file] [log] [blame]
Daniel Barkalow5751f492007-05-12 15:45:531#include "cache.h"
Brandon Williamsb2141fc2017-06-14 18:07:362#include "config.h"
Daniel Barkalow5751f492007-05-12 15:45:533#include "remote.h"
4#include "refs.h"
Brandon Williamsec0cb492018-05-16 22:57:485#include "refspec.h"
Stefan Bellercbd53a22018-05-15 23:42:156#include "object-store.h"
Junio C Hamano6d21bf92008-07-02 07:51:187#include "commit.h"
8#include "diff.h"
9#include "revision.h"
Alexander Potashev8ca12c02009-01-10 12:07:5010#include "dir.h"
Jay Soffianec8452d2009-02-25 08:32:1211#include "tag.h"
Julian Phillips73cf0822009-10-25 21:28:1112#include "string-list.h"
Jeff Kinged81c762012-05-21 22:19:2813#include "mergesort.h"
Jeff Kingdbbcd442020-07-28 20:23:3914#include "strvec.h"
Derrick Stolee64043552018-07-20 16:33:0415#include "commit-reach.h"
Ævar Arnfjörð Bjarmasondd8dd302018-11-13 19:52:4316#include "advice.h"
Daniel Barkalow5751f492007-05-12 15:45:5317
Felipe Contreras6ddba5e2012-02-22 22:43:4118enum map_direction { FROM_SRC, FROM_DST };
19
Junio C Hamano844112c2008-02-25 06:25:0420struct counted_string {
21 size_t len;
22 const char *s;
23};
Daniel Barkalow55029ae2008-02-20 18:43:5324struct rewrite {
25 const char *base;
Junio C Hamano844112c2008-02-25 06:25:0426 size_t baselen;
27 struct counted_string *instead_of;
Daniel Barkalow55029ae2008-02-20 18:43:5328 int instead_of_nr;
29 int instead_of_alloc;
30};
Josh Triplettd071d942009-09-07 08:56:0031struct rewrites {
32 struct rewrite **rewrite;
33 int rewrite_alloc;
34 int rewrite_nr;
35};
Daniel Barkalow55029ae2008-02-20 18:43:5336
Daniel Barkalow5751f492007-05-12 15:45:5337static struct remote **remotes;
Daniel Barkalow2d313472008-02-19 04:41:4138static int remotes_alloc;
39static int remotes_nr;
Patrick Reynoldsd0da0032014-07-29 14:43:3940static struct hashmap remotes_hash;
Daniel Barkalow5751f492007-05-12 15:45:5341
Daniel Barkalowcf818342007-09-11 03:02:5642static struct branch **branches;
Daniel Barkalow2d313472008-02-19 04:41:4143static int branches_alloc;
44static int branches_nr;
Daniel Barkalowcf818342007-09-11 03:02:5645
46static struct branch *current_branch;
Ramkumar Ramachandraf24f7152013-04-02 07:40:3247static const char *pushremote_name;
Daniel Barkalowcf818342007-09-11 03:02:5648
Josh Triplettd071d942009-09-07 08:56:0049static struct rewrites rewrites;
Josh Triplett1c2eafb2009-09-07 08:56:3350static struct rewrites rewrites_push;
Daniel Barkalow55029ae2008-02-20 18:43:5351
Daniel Barkalow0a4da292009-11-18 01:42:2352static int valid_remote(const struct remote *remote)
53{
Daniel Barkalowc578f512009-11-18 01:42:2554 return (!!remote->url) || (!!remote->foreign_vcs);
Daniel Barkalow0a4da292009-11-18 01:42:2355}
56
Josh Triplettd071d942009-09-07 08:56:0057static const char *alias_url(const char *url, struct rewrites *r)
Daniel Barkalow55029ae2008-02-20 18:43:5358{
59 int i, j;
Junio C Hamano844112c2008-02-25 06:25:0460 struct counted_string *longest;
61 int longest_i;
62
63 longest = NULL;
64 longest_i = -1;
Josh Triplettd071d942009-09-07 08:56:0065 for (i = 0; i < r->rewrite_nr; i++) {
66 if (!r->rewrite[i])
Daniel Barkalow55029ae2008-02-20 18:43:5367 continue;
Josh Triplettd071d942009-09-07 08:56:0068 for (j = 0; j < r->rewrite[i]->instead_of_nr; j++) {
Christian Couder59556542013-11-30 20:55:4069 if (starts_with(url, r->rewrite[i]->instead_of[j].s) &&
Junio C Hamano844112c2008-02-25 06:25:0470 (!longest ||
Josh Triplettd071d942009-09-07 08:56:0071 longest->len < r->rewrite[i]->instead_of[j].len)) {
72 longest = &(r->rewrite[i]->instead_of[j]);
Junio C Hamano844112c2008-02-25 06:25:0473 longest_i = i;
Daniel Barkalow55029ae2008-02-20 18:43:5374 }
75 }
76 }
Junio C Hamano844112c2008-02-25 06:25:0477 if (!longest)
78 return url;
79
Jeff King75faa452015-09-24 21:07:0380 return xstrfmt("%s%s", r->rewrite[longest_i]->base, url + longest->len);
Daniel Barkalow55029ae2008-02-20 18:43:5381}
82
Shawn O. Pearce28b91f82007-09-19 04:49:2783static void add_url(struct remote *remote, const char *url)
Daniel Barkalow5751f492007-05-12 15:45:5384{
Daniel Barkalow2d313472008-02-19 04:41:4185 ALLOC_GROW(remote->url, remote->url_nr + 1, remote->url_alloc);
86 remote->url[remote->url_nr++] = url;
Daniel Barkalow5751f492007-05-12 15:45:5387}
88
Michael J Gruber20346232009-06-09 16:01:3489static 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 Triplett1c2eafb2009-09-07 08:56:3395static 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
102static 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 Reynoldsd0da0032014-07-29 14:43:39108struct remotes_hash_key {
109 const char *str;
110 int len;
111};
112
Stefan Beller7663cdc2017-06-30 19:14:05113static int remotes_hash_cmp(const void *unused_cmp_data,
Eric Wong939af162019-10-06 23:30:37114 const struct hashmap_entry *eptr,
115 const struct hashmap_entry *entry_or_key,
Stefan Beller45dcb352017-07-01 00:28:35116 const void *keydata)
Patrick Reynoldsd0da0032014-07-29 14:43:39117{
Eric Wong939af162019-10-06 23:30:37118 const struct remote *a, *b;
Stefan Beller45dcb352017-07-01 00:28:35119 const struct remotes_hash_key *key = keydata;
120
Eric Wong939af162019-10-06 23:30:37121 a = container_of(eptr, const struct remote, ent);
122 b = container_of(entry_or_key, const struct remote, ent);
123
Patrick Reynoldsd0da0032014-07-29 14:43:39124 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
130static inline void init_remotes_hash(void)
131{
132 if (!remotes_hash.cmpfn)
Stefan Beller45dcb352017-07-01 00:28:35133 hashmap_init(&remotes_hash, remotes_hash_cmp, NULL, 0);
Patrick Reynoldsd0da0032014-07-29 14:43:39134}
135
Daniel Barkalow5751f492007-05-12 15:45:53136static struct remote *make_remote(const char *name, int len)
137{
Patrick Reynoldsd0da0032014-07-29 14:43:39138 struct remote *ret, *replaced;
139 struct remotes_hash_key lookup;
Eric Wongf23a4652019-10-06 23:30:36140 struct hashmap_entry lookup_entry, *e;
Daniel Barkalow5751f492007-05-12 15:45:53141
Patrick Reynoldsd0da0032014-07-29 14:43:39142 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 Wongf23a4652019-10-06 23:30:36150 e = hashmap_get(&remotes_hash, &lookup_entry, &lookup);
151 if (e)
152 return container_of(e, struct remote, ent);
Daniel Barkalow5751f492007-05-12 15:45:53153
Daniel Barkalow2d313472008-02-19 04:41:41154 ret = xcalloc(1, sizeof(struct remote));
Michael Schubert737c5a92013-07-13 09:36:24155 ret->prune = -1; /* unspecified */
Ævar Arnfjörð Bjarmason97716d22018-02-09 20:32:15156 ret->prune_tags = -1; /* unspecified */
Brandon Williams6bdb3042018-05-16 22:58:00157 ret->name = xstrndup(name, len);
158 refspec_init(&ret->push, REFSPEC_PUSH);
Brandon Williamse5349ab2018-05-16 22:58:01159 refspec_init(&ret->fetch, REFSPEC_FETCH);
Brandon Williams6bdb3042018-05-16 22:58:00160
Daniel Barkalow2d313472008-02-19 04:41:41161 ALLOC_GROW(remotes, remotes_nr + 1, remotes_alloc);
162 remotes[remotes_nr++] = ret;
Patrick Reynoldsd0da0032014-07-29 14:43:39163
Eric Wongd22245a2019-10-06 23:30:27164 hashmap_entry_init(&ret->ent, lookup_entry.hash);
Eric Wong404ab782019-10-06 23:30:42165 replaced = hashmap_put_entry(&remotes_hash, ret, ent);
Patrick Reynoldsd0da0032014-07-29 14:43:39166 assert(replaced == NULL); /* no previous entry overwritten */
Daniel Barkalow2d313472008-02-19 04:41:41167 return ret;
Daniel Barkalow5751f492007-05-12 15:45:53168}
169
Daniel Barkalowcf818342007-09-11 03:02:56170static void add_merge(struct branch *branch, const char *name)
171{
Daniel Barkalow2d313472008-02-19 04:41:41172 ALLOC_GROW(branch->merge_name, branch->merge_nr + 1,
173 branch->merge_alloc);
174 branch->merge_name[branch->merge_nr++] = name;
Daniel Barkalowcf818342007-09-11 03:02:56175}
176
Jeff King021ba322020-04-10 19:43:41177static struct branch *make_branch(const char *name, size_t len)
Daniel Barkalowcf818342007-09-11 03:02:56178{
Daniel Barkalow2d313472008-02-19 04:41:41179 struct branch *ret;
180 int i;
Daniel Barkalowcf818342007-09-11 03:02:56181
Daniel Barkalow2d313472008-02-19 04:41:41182 for (i = 0; i < branches_nr; i++) {
Jeff King021ba322020-04-10 19:43:41183 if (!strncmp(name, branches[i]->name, len) &&
184 !branches[i]->name[len])
Daniel Barkalow2d313472008-02-19 04:41:41185 return branches[i];
Daniel Barkalowcf818342007-09-11 03:02:56186 }
187
Daniel Barkalow2d313472008-02-19 04:41:41188 ALLOC_GROW(branches, branches_nr + 1, branches_alloc);
189 ret = xcalloc(1, sizeof(struct branch));
190 branches[branches_nr++] = ret;
Jeff King021ba322020-04-10 19:43:41191 ret->name = xstrndup(name, len);
Jeff Kingfa3f60b2014-06-18 20:02:13192 ret->refname = xstrfmt("refs/heads/%s", ret->name);
Daniel Barkalowcf818342007-09-11 03:02:56193
Daniel Barkalow2d313472008-02-19 04:41:41194 return ret;
Daniel Barkalowcf818342007-09-11 03:02:56195}
196
Jeff King021ba322020-04-10 19:43:41197static struct rewrite *make_rewrite(struct rewrites *r,
198 const char *base, size_t len)
Daniel Barkalow55029ae2008-02-20 18:43:53199{
200 struct rewrite *ret;
201 int i;
202
Josh Triplettd071d942009-09-07 08:56:00203 for (i = 0; i < r->rewrite_nr; i++) {
Jeff King021ba322020-04-10 19:43:41204 if (len == r->rewrite[i]->baselen &&
205 !strncmp(base, r->rewrite[i]->base, len))
Josh Triplettd071d942009-09-07 08:56:00206 return r->rewrite[i];
Daniel Barkalow55029ae2008-02-20 18:43:53207 }
208
Josh Triplettd071d942009-09-07 08:56:00209 ALLOC_GROW(r->rewrite, r->rewrite_nr + 1, r->rewrite_alloc);
Daniel Barkalow55029ae2008-02-20 18:43:53210 ret = xcalloc(1, sizeof(struct rewrite));
Josh Triplettd071d942009-09-07 08:56:00211 r->rewrite[r->rewrite_nr++] = ret;
Jeff King021ba322020-04-10 19:43:41212 ret->base = xstrndup(base, len);
213 ret->baselen = len;
Daniel Barkalow55029ae2008-02-20 18:43:53214 return ret;
215}
216
217static 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 Hamano844112c2008-02-25 06:25:04220 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 Barkalow55029ae2008-02-20 18:43:53223}
224
Jeff King0e265a92015-09-24 21:07:20225static const char *skip_spaces(const char *s)
226{
227 while (isspace(*s))
228 s++;
229 return s;
230}
231
Daniel Barkalow5751f492007-05-12 15:45:53232static void read_remotes_file(struct remote *remote)
233{
Jeff King0e265a92015-09-24 21:07:20234 struct strbuf buf = STRBUF_INIT;
Nguyễn Thái Ngọc Duye9d983f2017-05-03 10:16:50235 FILE *f = fopen_or_warn(git_path("remotes/%s", remote->name), "r");
Daniel Barkalow5751f492007-05-12 15:45:53236
237 if (!f)
238 return;
Johannes Schindeline459b072017-01-19 21:20:02239 remote->configured_in_repo = 1;
Miklos Vajna89cf4c72008-11-10 20:43:00240 remote->origin = REMOTE_REMOTES;
Junio C Hamano18814d02015-10-28 20:27:33241 while (strbuf_getline(&buf, f) != EOF) {
Jeff King0e265a92015-09-24 21:07:20242 const char *v;
Daniel Barkalow5751f492007-05-12 15:45:53243
Jeff King0e265a92015-09-24 21:07:20244 strbuf_rtrim(&buf);
Daniel Barkalow5751f492007-05-12 15:45:53245
Jeff King0e265a92015-09-24 21:07:20246 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 Williams6bdb3042018-05-16 22:58:00249 refspec_append(&remote->push, skip_spaces(v));
Jeff King0e265a92015-09-24 21:07:20250 else if (skip_prefix(buf.buf, "Pull:", &v))
Brandon Williamse5349ab2018-05-16 22:58:01251 refspec_append(&remote->fetch, skip_spaces(v));
Daniel Barkalow5751f492007-05-12 15:45:53252 }
Jeff King0e265a92015-09-24 21:07:20253 strbuf_release(&buf);
Daniel Barkalow5751f492007-05-12 15:45:53254 fclose(f);
255}
256
257static void read_branches_file(struct remote *remote)
258{
Daniel Barkalowcf818342007-09-11 03:02:56259 char *frag;
Jeff Kingf28e3ab2015-09-24 21:07:18260 struct strbuf buf = STRBUF_INIT;
Nguyễn Thái Ngọc Duye9d983f2017-05-03 10:16:50261 FILE *f = fopen_or_warn(git_path("branches/%s", remote->name), "r");
Daniel Barkalow5751f492007-05-12 15:45:53262
263 if (!f)
264 return;
Jeff Kingf28e3ab2015-09-24 21:07:18265
Junio C Hamano8f309ae2016-01-13 23:31:17266 strbuf_getline_lf(&buf, f);
Johannes Sixt0fb19902015-10-23 06:02:51267 fclose(f);
Jeff Kingf28e3ab2015-09-24 21:07:18268 strbuf_trim(&buf);
269 if (!buf.len) {
270 strbuf_release(&buf);
Daniel Barkalow5751f492007-05-12 15:45:53271 return;
Jeff Kingf28e3ab2015-09-24 21:07:18272 }
273
Johannes Schindeline459b072017-01-19 21:20:02274 remote->configured_in_repo = 1;
Miklos Vajna89cf4c72008-11-10 20:43:00275 remote->origin = REMOTE_BRANCHES;
Daniel Barkalow472fa4c2008-03-25 23:35:28276
277 /*
Ramkumar Ramachandra55cfde22013-06-22 07:58:12278 * The branches file would have URL and optionally
Johannes Schindelina4712142020-06-24 14:46:35279 * #branch specified. The default (or specified) branch is
Jeff Kingf28e3ab2015-09-24 21:07:18280 * fetched and stored in the local branch matching the
281 * remote name.
Daniel Barkalow472fa4c2008-03-25 23:35:28282 */
Jeff Kingf28e3ab2015-09-24 21:07:18283 frag = strchr(buf.buf, '#');
284 if (frag)
Daniel Barkalowcf818342007-09-11 03:02:56285 *(frag++) = '\0';
Jeff Kingf28e3ab2015-09-24 21:07:18286 else
Johannes Schindelina4712142020-06-24 14:46:35287 frag = (char *)git_default_branch_name();
Ramkumar Ramachandra55cfde22013-06-22 07:58:12288
Jeff Kingf28e3ab2015-09-24 21:07:18289 add_url_alias(remote, strbuf_detach(&buf, NULL));
René Scharfe1af8b8c2020-09-05 14:49:30290 refspec_appendf(&remote->fetch, "refs/heads/%s:refs/heads/%s",
291 frag, remote->name);
Jeff Kingf28e3ab2015-09-24 21:07:18292
Martin Koegler18afe102008-11-10 21:47:11293 /*
294 * Cogito compatible push: push current HEAD to remote #branch
295 * (master if missing)
296 */
René Scharfe1af8b8c2020-09-05 14:49:30297 refspec_appendf(&remote->push, "HEAD:refs/heads/%s", frag);
Daniel Barkalowd71ab172007-09-11 03:03:08298 remote->fetch_tags = 1; /* always auto-follow */
Daniel Barkalow5751f492007-05-12 15:45:53299}
300
Johannes Schindelinef90d6d2008-05-14 17:46:53301static int handle_config(const char *key, const char *value, void *cb)
Daniel Barkalow5751f492007-05-12 15:45:53302{
303 const char *name;
Jeff Kingf5914f42020-04-10 19:44:28304 size_t namelen;
Daniel Barkalow5751f492007-05-12 15:45:53305 const char *subkey;
306 struct remote *remote;
Daniel Barkalowcf818342007-09-11 03:02:56307 struct branch *branch;
Thomas Gummererbc60f8a2016-02-16 09:47:49308 if (parse_config_key(key, "branch", &name, &namelen, &subkey) >= 0) {
309 if (!name)
Daniel Barkalowcf818342007-09-11 03:02:56310 return 0;
Thomas Gummererbc60f8a2016-02-16 09:47:49311 branch = make_branch(name, namelen);
312 if (!strcmp(subkey, "remote")) {
Jeff Kinge41bf352015-05-01 22:44:41313 return git_config_string(&branch->remote_name, key, value);
Thomas Gummererbc60f8a2016-02-16 09:47:49314 } else if (!strcmp(subkey, "pushremote")) {
Jeff Kingda66b272015-05-21 04:45:20315 return git_config_string(&branch->pushremote_name, key, value);
Thomas Gummererbc60f8a2016-02-16 09:47:49316 } else if (!strcmp(subkey, "merge")) {
Junio C Hamanod2370cc2008-02-11 19:00:10317 if (!value)
318 return config_error_nonbool(key);
Daniel Barkalowcf818342007-09-11 03:02:56319 add_merge(branch, xstrdup(value));
Junio C Hamanod2370cc2008-02-11 19:00:10320 }
Daniel Barkalowcf818342007-09-11 03:02:56321 return 0;
Daniel Barkalow5751f492007-05-12 15:45:53322 }
Thomas Gummererbc60f8a2016-02-16 09:47:49323 if (parse_config_key(key, "url", &name, &namelen, &subkey) >= 0) {
Daniel Barkalow55029ae2008-02-20 18:43:53324 struct rewrite *rewrite;
Thomas Gummererbc60f8a2016-02-16 09:47:49325 if (!name)
Daniel Barkalow55029ae2008-02-20 18:43:53326 return 0;
Thomas Gummererbc60f8a2016-02-16 09:47:49327 if (!strcmp(subkey, "insteadof")) {
Josh Triplett1c2eafb2009-09-07 08:56:33328 if (!value)
329 return config_error_nonbool(key);
Jeff King54e8c112018-11-22 17:31:09330 rewrite = make_rewrite(&rewrites, name, namelen);
Josh Triplett1c2eafb2009-09-07 08:56:33331 add_instead_of(rewrite, xstrdup(value));
Thomas Gummererbc60f8a2016-02-16 09:47:49332 } else if (!strcmp(subkey, "pushinsteadof")) {
Daniel Barkalow55029ae2008-02-20 18:43:53333 if (!value)
334 return config_error_nonbool(key);
Jeff King54e8c112018-11-22 17:31:09335 rewrite = make_rewrite(&rewrites_push, name, namelen);
Daniel Barkalow55029ae2008-02-20 18:43:53336 add_instead_of(rewrite, xstrdup(value));
337 }
338 }
Ramkumar Ramachandra224c2172013-04-02 07:40:33339
Thomas Gummererbc60f8a2016-02-16 09:47:49340 if (parse_config_key(key, "remote", &name, &namelen, &subkey) < 0)
Daniel Barkalow5751f492007-05-12 15:45:53341 return 0;
Ramkumar Ramachandra224c2172013-04-02 07:40:33342
343 /* Handle remote.* variables */
Thomas Gummererbc60f8a2016-02-16 09:47:49344 if (!name && !strcmp(subkey, "pushdefault"))
Ramkumar Ramachandra224c2172013-04-02 07:40:33345 return git_config_string(&pushremote_name, key, value);
346
Thomas Gummererbc60f8a2016-02-16 09:47:49347 if (!name)
348 return 0;
Ramkumar Ramachandra224c2172013-04-02 07:40:33349 /* Handle remote.<name>.* variables */
Brandon Caseyc82efaf2008-10-14 20:30:21350 if (*name == '/') {
Nguyễn Thái Ngọc Duy0b9c3af2018-11-10 05:16:09351 warning(_("config remote shorthand cannot begin with '/': %s"),
Brandon Caseyc82efaf2008-10-14 20:30:21352 name);
353 return 0;
354 }
Thomas Gummererbc60f8a2016-02-16 09:47:49355 remote = make_remote(name, namelen);
Miklos Vajna89cf4c72008-11-10 20:43:00356 remote->origin = REMOTE_CONFIG;
Matthew Rogers6dc905d2020-02-10 00:30:54357 if (current_config_scope() == CONFIG_SCOPE_LOCAL ||
358 current_config_scope() == CONFIG_SCOPE_WORKTREE)
Johannes Schindeline459b072017-01-19 21:20:02359 remote->configured_in_repo = 1;
Thomas Gummererbc60f8a2016-02-16 09:47:49360 if (!strcmp(subkey, "mirror"))
Paolo Bonzini84bb2df2008-04-17 11:17:20361 remote->mirror = git_config_bool(key, value);
Thomas Gummererbc60f8a2016-02-16 09:47:49362 else if (!strcmp(subkey, "skipdefaultupdate"))
Paolo Bonzini84bb2df2008-04-17 11:17:20363 remote->skip_default_update = git_config_bool(key, value);
Thomas Gummererbc60f8a2016-02-16 09:47:49364 else if (!strcmp(subkey, "skipfetchall"))
Björn Gustavsson7cc91a22009-11-09 20:11:06365 remote->skip_default_update = git_config_bool(key, value);
Thomas Gummererbc60f8a2016-02-16 09:47:49366 else if (!strcmp(subkey, "prune"))
Michael Schubert737c5a92013-07-13 09:36:24367 remote->prune = git_config_bool(key, value);
Ævar Arnfjörð Bjarmason97716d22018-02-09 20:32:15368 else if (!strcmp(subkey, "prunetags"))
369 remote->prune_tags = git_config_bool(key, value);
Thomas Gummererbc60f8a2016-02-16 09:47:49370 else if (!strcmp(subkey, "url")) {
Paolo Bonzini84bb2df2008-04-17 11:17:20371 const char *v;
372 if (git_config_string(&v, key, value))
373 return -1;
374 add_url(remote, v);
Thomas Gummererbc60f8a2016-02-16 09:47:49375 } else if (!strcmp(subkey, "pushurl")) {
Michael J Gruber20346232009-06-09 16:01:34376 const char *v;
377 if (git_config_string(&v, key, value))
378 return -1;
379 add_pushurl(remote, v);
Thomas Gummererbc60f8a2016-02-16 09:47:49380 } else if (!strcmp(subkey, "push")) {
Paolo Bonzini84bb2df2008-04-17 11:17:20381 const char *v;
382 if (git_config_string(&v, key, value))
383 return -1;
Brandon Williams6bdb3042018-05-16 22:58:00384 refspec_append(&remote->push, v);
385 free((char *)v);
Thomas Gummererbc60f8a2016-02-16 09:47:49386 } else if (!strcmp(subkey, "fetch")) {
Paolo Bonzini84bb2df2008-04-17 11:17:20387 const char *v;
388 if (git_config_string(&v, key, value))
389 return -1;
Brandon Williamse5349ab2018-05-16 22:58:01390 refspec_append(&remote->fetch, v);
391 free((char *)v);
Thomas Gummererbc60f8a2016-02-16 09:47:49392 } else if (!strcmp(subkey, "receivepack")) {
Paolo Bonzini84bb2df2008-04-17 11:17:20393 const char *v;
394 if (git_config_string(&v, key, value))
395 return -1;
Daniel Barkalow5751f492007-05-12 15:45:53396 if (!remote->receivepack)
Paolo Bonzini84bb2df2008-04-17 11:17:20397 remote->receivepack = v;
Daniel Barkalow5751f492007-05-12 15:45:53398 else
Nguyễn Thái Ngọc Duy0b9c3af2018-11-10 05:16:09399 error(_("more than one receivepack given, using the first"));
Thomas Gummererbc60f8a2016-02-16 09:47:49400 } else if (!strcmp(subkey, "uploadpack")) {
Paolo Bonzini84bb2df2008-04-17 11:17:20401 const char *v;
402 if (git_config_string(&v, key, value))
403 return -1;
Daniel Barkalow0012ba22007-09-11 03:02:51404 if (!remote->uploadpack)
Paolo Bonzini84bb2df2008-04-17 11:17:20405 remote->uploadpack = v;
Daniel Barkalow0012ba22007-09-11 03:02:51406 else
Nguyễn Thái Ngọc Duy0b9c3af2018-11-10 05:16:09407 error(_("more than one uploadpack given, using the first"));
Thomas Gummererbc60f8a2016-02-16 09:47:49408 } else if (!strcmp(subkey, "tagopt")) {
Daniel Barkalowd71ab172007-09-11 03:03:08409 if (!strcmp(value, "--no-tags"))
410 remote->fetch_tags = -1;
Samuel Tardieu944163a2010-04-19 23:31:25411 else if (!strcmp(value, "--tags"))
412 remote->fetch_tags = 2;
Thomas Gummererbc60f8a2016-02-16 09:47:49413 } else if (!strcmp(subkey, "proxy")) {
Paolo Bonzini84bb2df2008-04-17 11:17:20414 return git_config_string((const char **)&remote->http_proxy,
415 key, value);
Thomas Gummererbc60f8a2016-02-16 09:47:49416 } else if (!strcmp(subkey, "proxyauthmethod")) {
Knut Frankeef976392016-01-26 13:02:47417 return git_config_string((const char **)&remote->http_proxy_authmethod,
418 key, value);
Thomas Gummererbc60f8a2016-02-16 09:47:49419 } else if (!strcmp(subkey, "vcs")) {
Daniel Barkalowc578f512009-11-18 01:42:25420 return git_config_string(&remote->foreign_vcs, key, value);
Paolo Bonzini84bb2df2008-04-17 11:17:20421 }
Daniel Barkalow5751f492007-05-12 15:45:53422 return 0;
423}
424
Daniel Barkalow55029ae2008-02-20 18:43:53425static void alias_all_urls(void)
426{
427 int i, j;
428 for (i = 0; i < remotes_nr; i++) {
Josh Triplett1c2eafb2009-09-07 08:56:33429 int add_pushurl_aliases;
Daniel Barkalow55029ae2008-02-20 18:43:53430 if (!remotes[i])
431 continue;
Michael J Gruber20346232009-06-09 16:01:34432 for (j = 0; j < remotes[i]->pushurl_nr; j++) {
Josh Triplettd071d942009-09-07 08:56:00433 remotes[i]->pushurl[j] = alias_url(remotes[i]->pushurl[j], &rewrites);
Michael J Gruber20346232009-06-09 16:01:34434 }
Josh Triplett1c2eafb2009-09-07 08:56:33435 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 Barkalow55029ae2008-02-20 18:43:53441 }
442}
443
Daniel Barkalow5751f492007-05-12 15:45:53444static void read_config(void)
445{
Jeff Kinge41bf352015-05-01 22:44:41446 static int loaded;
Daniel Barkalow5751f492007-05-12 15:45:53447 int flag;
Jeff Kinge41bf352015-05-01 22:44:41448
449 if (loaded)
Daniel Barkalow5751f492007-05-12 15:45:53450 return;
Jeff Kinge41bf352015-05-01 22:44:41451 loaded = 1;
452
Daniel Barkalow5751f492007-05-12 15:45:53453 current_branch = NULL;
Jeff Kingf2f12d12016-03-05 22:11:57454 if (startup_info->have_repository) {
René Scharfe744c0402017-09-23 09:45:04455 const char *head_ref = resolve_ref_unsafe("HEAD", 0, NULL, &flag);
Jeff Kingf2f12d12016-03-05 22:11:57456 if (head_ref && (flag & REF_ISSYMREF) &&
457 skip_prefix(head_ref, "refs/heads/", &head_ref)) {
Jeff King021ba322020-04-10 19:43:41458 current_branch = make_branch(head_ref, strlen(head_ref));
Jeff Kingf2f12d12016-03-05 22:11:57459 }
Daniel Barkalow5751f492007-05-12 15:45:53460 }
Johannes Schindelinef90d6d2008-05-14 17:46:53461 git_config(handle_config, NULL);
Daniel Barkalow55029ae2008-02-20 18:43:53462 alias_all_urls();
Daniel Barkalow5751f492007-05-12 15:45:53463}
464
Daniel Barkalowdf93e332008-02-15 19:14:18465static int valid_remote_nick(const char *name)
466{
Alexander Potashev8ca12c02009-01-10 12:07:50467 if (!name[0] || is_dot_or_dotdot(name))
Daniel Barkalowdf93e332008-02-15 19:14:18468 return 0;
Johannes Sixtd9244ec2017-05-25 12:00:13469
470 /* remote nicknames cannot contain slashes */
471 while (*name)
472 if (is_dir_sep(*name++))
473 return 0;
474 return 1;
Daniel Barkalowdf93e332008-02-15 19:14:18475}
476
Jeff Kingf0521542015-05-21 04:45:16477const 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 Kingda66b272015-05-21 04:45:20489const 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 Kingaf8ccd82020-03-03 16:12:22504const char *remote_ref_for_branch(struct branch *branch, int for_push)
J Wyman9700fae2017-11-07 16:31:08505{
506 if (branch) {
507 if (!for_push) {
508 if (branch->merge_nr) {
J Wyman9700fae2017-11-07 16:31:08509 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 Williams6bdb3042018-05-16 22:58:00516 if (remote && remote->push.nr &&
Brandon Williamsd0004142018-05-16 22:58:11517 (dst = apply_refspecs(&remote->push,
J Wyman9700fae2017-11-07 16:31:08518 branch->refname))) {
J Wyman9700fae2017-11-07 16:31:08519 return dst;
520 }
521 }
522 }
Jeff Kingaf8ccd82020-03-03 16:12:22523 return NULL;
J Wyman9700fae2017-11-07 16:31:08524}
525
Jeff Kingda66b272015-05-21 04:45:20526static struct remote *remote_get_1(const char *name,
527 const char *(*get_default)(struct branch *, int *))
Daniel Barkalow5751f492007-05-12 15:45:53528{
529 struct remote *ret;
Daniel Barkalowfa685bd2009-03-11 05:47:20530 int name_given = 0;
Daniel Barkalow5751f492007-05-12 15:45:53531
Jeff King8770e6f2015-05-21 04:45:23532 read_config();
533
Daniel Barkalowfa685bd2009-03-11 05:47:20534 if (name)
535 name_given = 1;
Jeff Kingda66b272015-05-21 04:45:20536 else
537 name = get_default(current_branch, &name_given);
Junio C Hamano9326d492009-03-16 07:35:09538
Daniel Barkalow5751f492007-05-12 15:45:53539 ret = make_remote(name, 0);
Jeff King4539c212017-02-14 20:33:28540 if (valid_remote_nick(name) && have_git_dir()) {
Daniel Barkalow0a4da292009-11-18 01:42:23541 if (!valid_remote(ret))
Daniel Barkalow5751f492007-05-12 15:45:53542 read_remotes_file(ret);
Daniel Barkalow0a4da292009-11-18 01:42:23543 if (!valid_remote(ret))
Daniel Barkalow5751f492007-05-12 15:45:53544 read_branches_file(ret);
545 }
Daniel Barkalow0a4da292009-11-18 01:42:23546 if (name_given && !valid_remote(ret))
Daniel Barkalow55029ae2008-02-20 18:43:53547 add_url_alias(ret, name);
Daniel Barkalow0a4da292009-11-18 01:42:23548 if (!valid_remote(ret))
Daniel Barkalow5751f492007-05-12 15:45:53549 return NULL;
Daniel Barkalow5751f492007-05-12 15:45:53550 return ret;
551}
Daniel Barkalow6b628162007-05-12 15:45:59552
Ramkumar Ramachandraf24f7152013-04-02 07:40:32553struct remote *remote_get(const char *name)
554{
Jeff Kingda66b272015-05-21 04:45:20555 return remote_get_1(name, remote_for_branch);
Ramkumar Ramachandraf24f7152013-04-02 07:40:32556}
557
558struct remote *pushremote_get(const char *name)
559{
Jeff Kingda66b272015-05-21 04:45:20560 return remote_get_1(name, pushremote_for_branch);
Ramkumar Ramachandraf24f7152013-04-02 07:40:32561}
562
Johannes Schindeline459b072017-01-19 21:20:02563int remote_is_configured(struct remote *remote, int in_repo)
Finn Arne Gangstad9a23ba32009-04-06 13:41:01564{
Johannes Schindeline459b072017-01-19 21:20:02565 if (!remote)
566 return 0;
567 if (in_repo)
568 return remote->configured_in_repo;
569 return !!remote->origin;
Finn Arne Gangstad9a23ba32009-04-06 13:41:01570}
571
Johannes Schindelinb42f6922007-07-10 17:48:40572int for_each_remote(each_remote_fn fn, void *priv)
573{
574 int i, result = 0;
575 read_config();
Daniel Barkalow2d313472008-02-19 04:41:41576 for (i = 0; i < remotes_nr && !result; i++) {
Johannes Schindelinb42f6922007-07-10 17:48:40577 struct remote *r = remotes[i];
578 if (!r)
579 continue;
Johannes Schindelinb42f6922007-07-10 17:48:40580 result = fn(r, priv);
581 }
582 return result;
583}
584
Michael Haggertydf02ebd2013-10-30 05:33:10585static void handle_duplicate(struct ref *ref1, struct ref *ref2)
586{
Michael Haggertyf096e6e2013-10-30 05:33:12587 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 Duy92ca8682018-11-10 05:16:08606 BUG("Internal error");
Michael Haggertyf096e6e2013-10-30 05:33:12607 }
608 }
Michael Haggertydf02ebd2013-10-30 05:33:10609 free(ref2->peer_ref);
610 free(ref2);
611}
612
Michael Haggertyb9afe662013-10-30 05:33:09613struct ref *ref_remove_duplicates(struct ref *ref_map)
Daniel Barkalow2467a4f2007-10-08 04:25:07614{
Thiago Farina183113a2010-07-04 19:46:19615 struct string_list refs = STRING_LIST_INIT_NODUP;
Michael Haggertyb9afe662013-10-30 05:33:09616 struct ref *retval = NULL;
617 struct ref **p = &retval;
Julian Phillips73cf0822009-10-25 21:28:11618
Michael Haggertyb9afe662013-10-30 05:33:09619 while (ref_map) {
620 struct ref *ref = ref_map;
Julian Phillips73cf0822009-10-25 21:28:11621
Michael Haggertyb9afe662013-10-30 05:33:09622 ref_map = ref_map->next;
623 ref->next = NULL;
624
625 if (!ref->peer_ref) {
626 *p = ref;
627 p = &ref->next;
Michael Haggerty09ea1f82013-10-30 05:33:07628 } else {
Michael Haggertyb9afe662013-10-30 05:33:09629 struct string_list_item *item =
630 string_list_insert(&refs, ref->peer_ref->name);
631
632 if (item->util) {
633 /* Entry already existed */
Michael Haggertydf02ebd2013-10-30 05:33:10634 handle_duplicate((struct ref *)item->util, ref);
Michael Haggertyb9afe662013-10-30 05:33:09635 } else {
636 *p = ref;
637 p = &ref->next;
638 item->util = ref;
639 }
Daniel Barkalow2467a4f2007-10-08 04:25:07640 }
Daniel Barkalow2467a4f2007-10-08 04:25:07641 }
Michael Haggertyb9afe662013-10-30 05:33:09642
Julian Phillips73cf0822009-10-25 21:28:11643 string_list_clear(&refs, 0);
Michael Haggertyb9afe662013-10-30 05:33:09644 return retval;
Daniel Barkalow2467a4f2007-10-08 04:25:07645}
646
Shawn O. Pearce28b91f82007-09-19 04:49:27647int remote_has_url(struct remote *remote, const char *url)
Daniel Barkalow5d46c9d2007-05-12 15:46:03648{
649 int i;
Shawn O. Pearce28b91f82007-09-19 04:49:27650 for (i = 0; i < remote->url_nr; i++) {
651 if (!strcmp(remote->url[i], url))
Daniel Barkalow5d46c9d2007-05-12 15:46:03652 return 1;
653 }
654 return 0;
655}
656
Daniel Barkalowe9282132009-03-07 06:11:34657static int match_name_with_pattern(const char *key, const char *name,
658 const char *value, char **result)
Daniel Barkalowa3c84232009-03-07 06:11:29659{
Daniel Barkalow08fbdb32009-03-07 06:11:36660 const char *kstar = strchr(key, '*');
661 size_t klen;
Daniel Barkalowabd2bde2009-03-07 06:11:39662 size_t ksuffixlen;
663 size_t namelen;
Daniel Barkalow08fbdb32009-03-07 06:11:36664 int ret;
665 if (!kstar)
Nguyễn Thái Ngọc Duy0b9c3af2018-11-10 05:16:09666 die(_("key '%s' of pattern had no '*'"), key);
Daniel Barkalow08fbdb32009-03-07 06:11:36667 klen = kstar - key;
Daniel Barkalowabd2bde2009-03-07 06:11:39668 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 Barkalowe9282132009-03-07 06:11:34672 if (ret && value) {
René Scharfe07bfa572014-09-21 08:23:37673 struct strbuf sb = STRBUF_INIT;
Daniel Barkalow08fbdb32009-03-07 06:11:36674 const char *vstar = strchr(value, '*');
Daniel Barkalow08fbdb32009-03-07 06:11:36675 if (!vstar)
Nguyễn Thái Ngọc Duy0b9c3af2018-11-10 05:16:09676 die(_("value '%s' of pattern has no '*'"), value);
René Scharfe07bfa572014-09-21 08:23:37677 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 Barkalowe9282132009-03-07 06:11:34681 }
Daniel Barkalowa3c84232009-03-07 06:11:29682 return ret;
683}
684
Jacob Kellerc0192df2020-09-30 21:25:29685static 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
694static 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
705struct 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
723static 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 Williamsa2ac50c2018-05-16 22:58:10770static void query_refspecs_multiple(struct refspec *rs,
771 struct refspec_item *query,
772 struct string_list *results)
Carlos Martín Nietoe6f63712014-02-27 09:00:10773{
774 int i;
775 int find_src = !query->src;
776
777 if (find_src && !query->dst)
Nguyễn Thái Ngọc Duy92ca8682018-11-10 05:16:08778 BUG("query_refspecs_multiple: need either src or dst");
Carlos Martín Nietoe6f63712014-02-27 09:00:10779
Jacob Kellerc0192df2020-09-30 21:25:29780 if (query_matches_negative_refspec(rs, query))
781 return;
782
Brandon Williamsa2ac50c2018-05-16 22:58:10783 for (i = 0; i < rs->nr; i++) {
784 struct refspec_item *refspec = &rs->items[i];
Carlos Martín Nietoe6f63712014-02-27 09:00:10785 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 Kellerc0192df2020-09-30 21:25:29790 if (!refspec->dst || refspec->negative)
Carlos Martín Nietoe6f63712014-02-27 09:00:10791 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 Williams86baf822018-05-16 22:58:12801int query_refspecs(struct refspec *rs, struct refspec_item *query)
Daniel Barkalow72ff8942009-11-18 01:42:28802{
803 int i;
Carlos Martín Nietoc5003522011-10-15 05:04:24804 int find_src = !query->src;
Michael Haggerty049bff82013-10-30 05:33:01805 const char *needle = find_src ? query->dst : query->src;
806 char **result = find_src ? &query->src : &query->dst;
Daniel Barkalow72ff8942009-11-18 01:42:28807
Carlos Martín Nietoc5003522011-10-15 05:04:24808 if (find_src && !query->dst)
Nguyễn Thái Ngọc Duy92ca8682018-11-10 05:16:08809 BUG("query_refspecs: need either src or dst");
Johannes Schindelinb42f6922007-07-10 17:48:40810
Jacob Kellerc0192df2020-09-30 21:25:29811 if (query_matches_negative_refspec(rs, query))
812 return -1;
813
Brandon Williams86baf822018-05-16 22:58:12814 for (i = 0; i < rs->nr; i++) {
815 struct refspec_item *refspec = &rs->items[i];
Carlos Martín Nietoc5003522011-10-15 05:04:24816 const char *key = find_src ? refspec->dst : refspec->src;
817 const char *value = find_src ? refspec->src : refspec->dst;
Carlos Martín Nietoc5003522011-10-15 05:04:24818
Jacob Kellerc0192df2020-09-30 21:25:29819 if (!refspec->dst || refspec->negative)
Daniel Barkalow5d46c9d2007-05-12 15:46:03820 continue;
Carlos Martín Nietoc5003522011-10-15 05:04:24821 if (refspec->pattern) {
Daniel Barkalowe9282132009-03-07 06:11:34822 if (match_name_with_pattern(key, needle, value, result)) {
Carlos Martín Nietoc5003522011-10-15 05:04:24823 query->force = refspec->force;
Daniel Barkalow5d46c9d2007-05-12 15:46:03824 return 0;
825 }
Johannes Schindelinb42f6922007-07-10 17:48:40826 } else if (!strcmp(needle, key)) {
827 *result = xstrdup(value);
Carlos Martín Nietoc5003522011-10-15 05:04:24828 query->force = refspec->force;
Johannes Schindelinb42f6922007-07-10 17:48:40829 return 0;
Daniel Barkalow5d46c9d2007-05-12 15:46:03830 }
831 }
Daniel Barkalow5d46c9d2007-05-12 15:46:03832 return -1;
833}
834
Brandon Williamsd0004142018-05-16 22:58:11835char *apply_refspecs(struct refspec *rs, const char *name)
Carlos Martín Nietoc5003522011-10-15 05:04:24836{
Brandon Williams0ad4a5f2018-05-16 22:57:49837 struct refspec_item query;
Carlos Martín Nietoc5003522011-10-15 05:04:24838
Brandon Williams0ad4a5f2018-05-16 22:57:49839 memset(&query, 0, sizeof(struct refspec_item));
Carlos Martín Nietoc5003522011-10-15 05:04:24840 query.src = (char *)name;
841
Brandon Williams86baf822018-05-16 22:58:12842 if (query_refspecs(rs, &query))
Carlos Martín Nietoc5003522011-10-15 05:04:24843 return NULL;
844
845 return query.dst;
846}
847
Brandon Williams0ad4a5f2018-05-16 22:57:49848int remote_find_tracking(struct remote *remote, struct refspec_item *refspec)
Carlos Martín Nietoc5003522011-10-15 05:04:24849{
Brandon Williams86baf822018-05-16 22:58:12850 return query_refspecs(&remote->fetch, refspec);
Carlos Martín Nietoc5003522011-10-15 05:04:24851}
852
René Scharfe80097682008-10-18 08:37:40853static struct ref *alloc_ref_with_prefix(const char *prefix, size_t prefixlen,
854 const char *name)
855{
856 size_t len = strlen(name);
Jeff King50a6c8e2016-02-22 22:44:35857 struct ref *ref = xcalloc(1, st_add4(sizeof(*ref), prefixlen, len, 1));
René Scharfe80097682008-10-18 08:37:40858 memcpy(ref->name, prefix, prefixlen);
859 memcpy(ref->name + prefixlen, name, len);
860 return ref;
861}
862
René Scharfe59c69c02008-10-18 08:44:18863struct ref *alloc_ref(const char *name)
Daniel Barkalowdfd255d2007-07-10 04:47:23864{
René Scharfe59c69c02008-10-18 08:44:18865 return alloc_ref_with_prefix("", 0, name);
Krzysztof Kowalczyk737922a2008-05-10 23:26:58866}
867
Jeff King59a57752011-06-07 23:03:03868struct ref *copy_ref(const struct ref *ref)
Daniel Barkalowd71ab172007-09-11 03:03:08869{
Jay Soffian7b3db092009-02-27 19:10:04870 struct ref *cpy;
871 size_t len;
872 if (!ref)
873 return NULL;
Jeff King50a6c8e2016-02-22 22:44:35874 len = st_add3(sizeof(struct ref), strlen(ref->name), 1);
875 cpy = xmalloc(len);
876 memcpy(cpy, ref, len);
Jay Soffian7b3db092009-02-27 19:10:04877 cpy->next = NULL;
Jeff King8c53f072015-01-13 01:59:09878 cpy->symref = xstrdup_or_null(ref->symref);
879 cpy->remote_status = xstrdup_or_null(ref->remote_status);
Jay Soffian7b3db092009-02-27 19:10:04880 cpy->peer_ref = copy_ref(ref->peer_ref);
881 return cpy;
Daniel Barkalowd71ab172007-09-11 03:03:08882}
883
Daniel Barkalow45773702007-10-30 01:05:40884struct 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 King10271862019-04-13 05:54:31896void free_one_ref(struct ref *ref)
Daniel Barkalowbe885d92008-04-26 19:53:12897{
898 if (!ref)
899 return;
Jeff King10271862019-04-13 05:54:31900 free_one_ref(ref->peer_ref);
Daniel Barkalowbe885d92008-04-26 19:53:12901 free(ref->remote_status);
902 free(ref->symref);
903 free(ref);
904}
905
Daniel Barkalowdfd255d2007-07-10 04:47:23906void free_refs(struct ref *ref)
907{
908 struct ref *next;
909 while (ref) {
910 next = ref->next;
Jeff King10271862019-04-13 05:54:31911 free_one_ref(ref);
Daniel Barkalowdfd255d2007-07-10 04:47:23912 ref = next;
913 }
914}
915
Jeff Kinged81c762012-05-21 22:19:28916int 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
922static void *ref_list_get_next(const void *a)
923{
924 return ((const struct ref *)a)->next;
925}
926
927static void ref_list_set_next(void *a, void *next)
928{
929 ((struct ref *)a)->next = next;
930}
931
932void 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 Hamanoca024652013-12-03 23:41:15937int count_refspec_match(const char *pattern,
938 struct ref *refs,
939 struct ref **matched_ref)
Daniel Barkalow6b628162007-05-12 15:45:59940{
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 Barkalow6b628162007-05-12 15:45:59950
Michael Haggerty54457fe2014-01-14 03:16:07951 if (!refname_match(pattern, name))
Daniel Barkalow6b628162007-05-12 15:45:59952 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 Couder59556542013-11-30 20:55:40964 !starts_with(name, "refs/heads/") &&
965 !starts_with(name, "refs/tags/")) {
Daniel Barkalow6b628162007-05-12 15:45:59966 /* 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 King471fd3f2014-03-05 19:03:43982 if (matched_ref)
983 *matched_ref = matched_weak;
Daniel Barkalow6b628162007-05-12 15:45:59984 return weak_match;
985 }
986 else {
Jeff King471fd3f2014-03-05 19:03:43987 if (matched_ref)
988 *matched_ref = matched;
Daniel Barkalow6b628162007-05-12 15:45:59989 return match;
990 }
991}
992
Daniel Barkalow1d735262007-07-10 04:47:26993static void tail_link_ref(struct ref *ref, struct ref ***tail)
Daniel Barkalow6b628162007-05-12 15:45:59994{
995 **tail = ref;
Daniel Barkalow1d735262007-07-10 04:47:26996 while (ref->next)
997 ref = ref->next;
Daniel Barkalow6b628162007-05-12 15:45:59998 *tail = &ref->next;
Daniel Barkalow6b628162007-05-12 15:45:59999}
1000
Felipe Contreras67655242012-02-22 22:43:401001static struct ref *alloc_delete_ref(void)
1002{
1003 struct ref *ref = alloc_ref("(delete)");
brian m. carlsonf4e54d02015-11-10 02:22:201004 oidclr(&ref->new_oid);
Felipe Contreras67655242012-02-22 22:43:401005 return ref;
1006}
1007
Jeff King471fd3f2014-03-05 19:03:431008static int try_explicit_object_name(const char *name,
1009 struct ref **match)
Daniel Barkalow6b628162007-05-12 15:45:591010{
brian m. carlsonfcd30b12015-11-10 02:22:301011 struct object_id oid;
Daniel Barkalow6b628162007-05-12 15:45:591012
Jeff King471fd3f2014-03-05 19:03:431013 if (!*name) {
1014 if (match)
1015 *match = alloc_delete_ref();
1016 return 0;
1017 }
1018
brian m. carlsone82caf32017-07-13 23:49:281019 if (get_oid(name, &oid))
Jeff King471fd3f2014-03-05 19:03:431020 return -1;
1021
1022 if (match) {
1023 *match = alloc_ref(name);
brian m. carlsonfcd30b12015-11-10 02:22:301024 oidcpy(&(*match)->new_oid, &oid);
Jeff King471fd3f2014-03-05 19:03:431025 }
1026 return 0;
Daniel Barkalow6b628162007-05-12 15:45:591027}
1028
Daniel Barkalow1d735262007-07-10 04:47:261029static struct ref *make_linked_ref(const char *name, struct ref ***tail)
Junio C Hamano163f0ee2007-06-09 07:07:341030{
René Scharfe59c69c02008-10-18 08:44:181031 struct ref *ret = alloc_ref(name);
Daniel Barkalow1d735262007-07-10 04:47:261032 tail_link_ref(ret, tail);
1033 return ret;
Junio C Hamano163f0ee2007-06-09 07:07:341034}
1035
Jeff Kingf8aae122008-04-23 09:16:061036static char *guess_ref(const char *name, struct ref *peer)
1037{
1038 struct strbuf buf = STRBUF_INIT;
Jeff Kingf8aae122008-04-23 09:16:061039
Ronnie Sahlberg7695d112014-07-15 19:59:361040 const char *r = resolve_ref_unsafe(peer->name, RESOLVE_REF_READING,
René Scharfe744c0402017-09-23 09:45:041041 NULL, NULL);
Jeff Kingf8aae122008-04-23 09:16:061042 if (!r)
1043 return NULL;
1044
Ævar Arnfjörð Bjarmasoncab53982018-11-13 19:52:391045 if (starts_with(r, "refs/heads/")) {
Jeff Kingf8aae122008-04-23 09:16:061046 strbuf_addstr(&buf, "refs/heads/");
Ævar Arnfjörð Bjarmasoncab53982018-11-13 19:52:391047 } else if (starts_with(r, "refs/tags/")) {
Jeff Kingf8aae122008-04-23 09:16:061048 strbuf_addstr(&buf, "refs/tags/");
Ævar Arnfjörð Bjarmasoncab53982018-11-13 19:52:391049 } else {
Jeff Kingf8aae122008-04-23 09:16:061050 return NULL;
Ævar Arnfjörð Bjarmasoncab53982018-11-13 19:52:391051 }
Jeff Kingf8aae122008-04-23 09:16:061052
1053 strbuf_addstr(&buf, name);
1054 return strbuf_detach(&buf, NULL);
1055}
1056
Jeff Kingf7ade3d2014-03-05 19:03:211057static int match_explicit_lhs(struct ref *src,
Brandon Williams0ad4a5f2018-05-16 22:57:491058 struct refspec_item *rs,
Jeff Kingf7ade3d2014-03-05 19:03:211059 struct ref **match,
1060 int *allocated_match)
1061{
1062 switch (count_refspec_match(rs->src, src, match)) {
1063 case 1:
Jeff King471fd3f2014-03-05 19:03:431064 if (allocated_match)
1065 *allocated_match = 0;
Jeff Kingf7ade3d2014-03-05 19:03:211066 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 King471fd3f2014-03-05 19:03:431072 if (try_explicit_object_name(rs->src, match) < 0)
Nguyễn Thái Ngọc Duy0b9c3af2018-11-10 05:16:091073 return error(_("src refspec %s does not match any"), rs->src);
Jeff King471fd3f2014-03-05 19:03:431074 if (allocated_match)
1075 *allocated_match = 1;
Jeff Kingf7ade3d2014-03-05 19:03:211076 return 0;
1077 default:
Nguyễn Thái Ngọc Duy0b9c3af2018-11-10 05:16:091078 return error(_("src refspec %s matches more than one"), rs->src);
Jeff Kingf7ade3d2014-03-05 19:03:211079 }
1080}
1081
Ævar Arnfjörð Bjarmason04d17282018-11-13 19:52:421082static void show_push_unqualified_ref_name_error(const char *dst_value,
1083 const char *matched_src_name)
1084{
Ævar Arnfjörð Bjarmasondd8dd302018-11-13 19:52:431085 struct object_id oid;
1086 enum object_type type;
1087
Ævar Arnfjörð Bjarmason04d17282018-11-13 19:52:421088 /*
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ð Bjarmasondd8dd302018-11-13 19:52:431103
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ð Bjarmason04d17282018-11-13 19:52:421136}
1137
Junio C Hamano54a8ad92007-06-09 06:22:581138static int match_explicit(struct ref *src, struct ref *dst,
1139 struct ref ***dst_tail,
Brandon Williams0ad4a5f2018-05-16 22:57:491140 struct refspec_item *rs)
Junio C Hamano54a8ad92007-06-09 06:22:581141{
1142 struct ref *matched_src, *matched_dst;
Jeff Kingf7ade3d2014-03-05 19:03:211143 int allocated_src;
Junio C Hamano54a8ad92007-06-09 06:22:581144
1145 const char *dst_value = rs->dst;
Jeff Kingf8aae122008-04-23 09:16:061146 char *dst_guess;
Junio C Hamano54a8ad92007-06-09 06:22:581147
Jacob Kellerc0192df2020-09-30 21:25:291148 if (rs->pattern || rs->matching || rs->negative)
Jeff King9a7bbd12008-06-16 16:15:021149 return 0;
Junio C Hamano54a8ad92007-06-09 06:22:581150
Junio C Hamano54a8ad92007-06-09 06:22:581151 matched_src = matched_dst = NULL;
Jeff Kingf7ade3d2014-03-05 19:03:211152 if (match_explicit_lhs(src, rs, &matched_src, &allocated_src) < 0)
1153 return -1;
Junio C Hamano3c8b7df2007-06-09 07:14:041154
Shawn O. Pearce4491e622007-09-25 04:13:251155 if (!dst_value) {
Daniel Barkalow9f0ea7e2008-02-20 17:54:051156 int flag;
1157
Ronnie Sahlberg7695d112014-07-15 19:59:361158 dst_value = resolve_ref_unsafe(matched_src->name,
1159 RESOLVE_REF_READING,
René Scharfe744c0402017-09-23 09:45:041160 NULL, &flag);
Daniel Barkalow9f0ea7e2008-02-20 17:54:051161 if (!dst_value ||
1162 ((flag & REF_ISSYMREF) &&
Christian Couder59556542013-11-30 20:55:401163 !starts_with(dst_value, "refs/heads/")))
Nguyễn Thái Ngọc Duy0b9c3af2018-11-10 05:16:091164 die(_("%s cannot be resolved to branch"),
Daniel Barkalow9f0ea7e2008-02-20 17:54:051165 matched_src->name);
Shawn O. Pearce4491e622007-09-25 04:13:251166 }
Junio C Hamano3c8b7df2007-06-09 07:14:041167
Junio C Hamano54a8ad92007-06-09 06:22:581168 switch (count_refspec_match(dst_value, dst, &matched_dst)) {
1169 case 1:
1170 break;
1171 case 0:
Ævar Arnfjörð Bjarmasoncab53982018-11-13 19:52:391172 if (starts_with(dst_value, "refs/")) {
Daniel Barkalow1d735262007-07-10 04:47:261173 matched_dst = make_linked_ref(dst_value, dst_tail);
Ævar Arnfjörð Bjarmasoncab53982018-11-13 19:52:391174 } else if (is_null_oid(&matched_src->new_oid)) {
Nguyễn Thái Ngọc Duy0b9c3af2018-11-10 05:16:091175 error(_("unable to delete '%s': remote ref does not exist"),
Jeff King5742c822012-07-03 18:04:391176 dst_value);
Ævar Arnfjörð Bjarmasoncab53982018-11-13 19:52:391177 } else if ((dst_guess = guess_ref(dst_value, matched_src))) {
Jeff Kingf8aae122008-04-23 09:16:061178 matched_dst = make_linked_ref(dst_guess, dst_tail);
Johannes Schindelin3dc7ea92017-05-04 13:59:011179 free(dst_guess);
Ævar Arnfjörð Bjarmasoncab53982018-11-13 19:52:391180 } else {
Ævar Arnfjörð Bjarmason04d17282018-11-13 19:52:421181 show_push_unqualified_ref_name_error(dst_value,
1182 matched_src->name);
Ævar Arnfjörð Bjarmasoncab53982018-11-13 19:52:391183 }
Junio C Hamano54a8ad92007-06-09 06:22:581184 break;
1185 default:
Junio C Hamano3c8b7df2007-06-09 07:14:041186 matched_dst = NULL;
Nguyễn Thái Ngọc Duy0b9c3af2018-11-10 05:16:091187 error(_("dst refspec %s matches more than one"),
Junio C Hamano54a8ad92007-06-09 06:22:581188 dst_value);
1189 break;
1190 }
Jeff King9a7bbd12008-06-16 16:15:021191 if (!matched_dst)
1192 return -1;
1193 if (matched_dst->peer_ref)
Nguyễn Thái Ngọc Duy0b9c3af2018-11-10 05:16:091194 return error(_("dst ref %s receives from more than one src"),
1195 matched_dst->name);
Junio C Hamano54a8ad92007-06-09 06:22:581196 else {
Jeff Kingf7ade3d2014-03-05 19:03:211197 matched_dst->peer_ref = allocated_src ?
1198 matched_src :
1199 copy_ref(matched_src);
Junio C Hamano54a8ad92007-06-09 06:22:581200 matched_dst->force = rs->force;
1201 }
Jeff King9a7bbd12008-06-16 16:15:021202 return 0;
Junio C Hamano54a8ad92007-06-09 06:22:581203}
1204
Daniel Barkalow6b628162007-05-12 15:45:591205static int match_explicit_refs(struct ref *src, struct ref *dst,
Brandon Williams9fa2e5e2018-05-16 22:58:141206 struct ref ***dst_tail, struct refspec *rs)
Daniel Barkalow6b628162007-05-12 15:45:591207{
1208 int i, errs;
Brandon Williams9fa2e5e2018-05-16 22:58:141209 for (i = errs = 0; i < rs->nr; i++)
1210 errs += match_explicit(src, dst, dst_tail, &rs->items[i]);
Jeff King9a7bbd12008-06-16 16:15:021211 return errs;
Daniel Barkalow6b628162007-05-12 15:45:591212}
1213
Brandon Williamsf3acb832018-05-16 22:58:131214static 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 Barkalow8558fd92007-05-25 05:20:561217{
Brandon Williams0ad4a5f2018-05-16 22:57:491218 const struct refspec_item *pat;
Felipe Contrerasdb70a042012-02-22 22:43:391219 char *name;
Daniel Barkalow8558fd92007-05-25 05:20:561220 int i;
Paolo Bonzinia83619d2008-04-28 15:32:121221 int matching_refs = -1;
Brandon Williamsf3acb832018-05-16 22:58:131222 for (i = 0; i < rs->nr; i++) {
1223 const struct refspec_item *item = &rs->items[i];
Jacob Kellerc0192df2020-09-30 21:25:291224
1225 if (item->negative)
1226 continue;
1227
Brandon Williamsf3acb832018-05-16 22:58:131228 if (item->matching &&
1229 (matching_refs == -1 || item->force)) {
Paolo Bonzinia83619d2008-04-28 15:32:121230 matching_refs = i;
1231 continue;
1232 }
1233
Brandon Williamsf3acb832018-05-16 22:58:131234 if (item->pattern) {
1235 const char *dst_side = item->dst ? item->dst : item->src;
Felipe Contreras6ddba5e2012-02-22 22:43:411236 int match;
1237 if (direction == FROM_SRC)
Brandon Williamsf3acb832018-05-16 22:58:131238 match = match_name_with_pattern(item->src, ref->name, dst_side, &name);
Felipe Contreras6ddba5e2012-02-22 22:43:411239 else
Brandon Williamsf3acb832018-05-16 22:58:131240 match = match_name_with_pattern(dst_side, ref->name, item->src, &name);
Felipe Contreras6ddba5e2012-02-22 22:43:411241 if (match) {
Felipe Contrerasdb70a042012-02-22 22:43:391242 matching_refs = i;
1243 break;
1244 }
1245 }
Daniel Barkalow8558fd92007-05-25 05:20:561246 }
Felipe Contrerasdb70a042012-02-22 22:43:391247 if (matching_refs == -1)
Paolo Bonzinia83619d2008-04-28 15:32:121248 return NULL;
Felipe Contrerasdb70a042012-02-22 22:43:391249
Brandon Williamsf3acb832018-05-16 22:58:131250 pat = &rs->items[matching_refs];
Felipe Contrerasdb70a042012-02-22 22:43:391251 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 Couder59556542013-11-30 20:55:401257 if (!send_mirror && !starts_with(ref->name, "refs/heads/"))
Felipe Contrerasdb70a042012-02-22 22:43:391258 return NULL;
1259 name = xstrdup(ref->name);
1260 }
1261 if (ret_pat)
1262 *ret_pat = pat;
1263 return name;
Daniel Barkalow8558fd92007-05-25 05:20:561264}
1265
Clemens Buchacher6d2bf962009-05-31 14:26:481266static 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 Hamanoc2aba152013-03-04 20:09:501274struct tips {
1275 struct commit **tip;
1276 int nr, alloc;
1277};
1278
brian m. carlsonfcd30b12015-11-10 02:22:301279static void add_to_tips(struct tips *tips, const struct object_id *oid)
Junio C Hamanoc2aba152013-03-04 20:09:501280{
1281 struct commit *commit;
1282
brian m. carlsonfcd30b12015-11-10 02:22:301283 if (is_null_oid(oid))
Junio C Hamanoc2aba152013-03-04 20:09:501284 return;
Stefan Beller21e1ee82018-06-29 01:21:571285 commit = lookup_commit_reference_gently(the_repository, oid, 1);
Junio C Hamanoc2aba152013-03-04 20:09:501286 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
1293static 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. carlsonf4e54d02015-11-10 02:22:201308 !is_null_oid(&ref->peer_ref->new_oid))
brian m. carlsonfcd30b12015-11-10 02:22:301309 add_to_tips(&sent_tips, &ref->peer_ref->new_oid);
Junio C Hamanoc2aba152013-03-04 20:09:501310 else
brian m. carlsonfcd30b12015-11-10 02:22:301311 add_to_tips(&sent_tips, &ref->old_oid);
Christian Couder59556542013-11-30 20:55:401312 if (starts_with(ref->name, "refs/tags/"))
Junio C Hamanoc2aba152013-03-04 20:09:501313 string_list_append(&dst_tag, ref->name);
1314 }
1315 clear_commit_marks_many(sent_tips.nr, sent_tips.tip, TMP_MARK);
1316
Michael Haggerty3383e192014-11-25 08:02:351317 string_list_sort(&dst_tag);
Junio C Hamanoc2aba152013-03-04 20:09:501318
1319 /* Collect tags they do not have. */
1320 for (ref = src; ref; ref = ref->next) {
Christian Couder59556542013-11-30 20:55:401321 if (!starts_with(ref->name, "refs/tags/"))
Junio C Hamanoc2aba152013-03-04 20:09:501322 continue; /* not a tag */
1323 if (string_list_has_string(&dst_tag, ref->name))
1324 continue; /* they already have it */
Stefan Beller0df8e962018-04-25 18:20:591325 if (oid_object_info(the_repository, &ref->new_oid, NULL) != OBJ_TAG)
Junio C Hamanoc2aba152013-03-04 20:09:501326 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 Stolee85daa012018-11-02 13:14:491340 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 Hamanoc2aba152013-03-04 20:09:501346 for_each_string_list_item(item, &src_tag) {
1347 struct ref *ref = item->util;
Derrick Stolee85daa012018-11-02 13:14:491348 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 Hamanoc2aba152013-03-04 20:09:501368 struct ref *dst_ref;
Derrick Stolee85daa012018-11-02 13:14:491369 struct ref *ref = item->util;
Junio C Hamanoc2aba152013-03-04 20:09:501370 struct commit *commit;
1371
brian m. carlsonf4e54d02015-11-10 02:22:201372 if (is_null_oid(&ref->new_oid))
Junio C Hamanoc2aba152013-03-04 20:09:501373 continue;
Stefan Beller21e1ee82018-06-29 01:21:571374 commit = lookup_commit_reference_gently(the_repository,
1375 &ref->new_oid,
brian m. carlsonbc832662017-05-06 22:10:101376 1);
Junio C Hamanoc2aba152013-03-04 20:09:501377 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 Stolee85daa012018-11-02 13:14:491385 if (!(commit->object.flags & reachable_flag))
Junio C Hamanoc2aba152013-03-04 20:09:501386 continue;
1387
1388 /* Add it in */
1389 dst_ref = make_linked_ref(ref->name, dst_tail);
brian m. carlsonf4e54d02015-11-10 02:22:201390 oidcpy(&dst_ref->new_oid, &ref->new_oid);
Junio C Hamanoc2aba152013-03-04 20:09:501391 dst_ref->peer_ref = copy_ref(ref);
1392 }
Derrick Stolee85daa012018-11-02 13:14:491393
1394 clear_commit_marks_many(nr_src_commits, src_commits, reachable_flag);
1395 free(src_commits);
1396 free_commit_list(found_commits);
Junio C Hamanoc2aba152013-03-04 20:09:501397 }
Derrick Stolee85daa012018-11-02 13:14:491398
Junio C Hamanoc2aba152013-03-04 20:09:501399 string_list_clear(&src_tag, 0);
1400 free(sent_tips.tip);
1401}
1402
Junio C Hamano47a59182013-07-08 20:56:531403struct 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 Caseyf1bd15a2013-07-08 08:58:391411static 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 Haggerty3383e192014-11-25 08:02:351416 string_list_sort(ref_index);
Brandon Caseyf1bd15a2013-07-08 08:58:391417}
1418
Junio C Hamano54a8ad92007-06-09 06:22:581419/*
Jeff Kingba928c12014-03-05 19:04:541420 * 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 Williamsafb1aed2018-05-16 22:58:221425int check_push_refs(struct ref *src, struct refspec *rs)
Jeff Kingba928c12014-03-05 19:04:541426{
Jeff Kingba928c12014-03-05 19:04:541427 int ret = 0;
1428 int i;
1429
Brandon Williamsafb1aed2018-05-16 22:58:221430 for (i = 0; i < rs->nr; i++) {
1431 struct refspec_item *item = &rs->items[i];
Jeff Kingba928c12014-03-05 19:04:541432
Jacob Kellerc0192df2020-09-30 21:25:291433 if (item->pattern || item->matching || item->negative)
Jeff Kingba928c12014-03-05 19:04:541434 continue;
1435
Brandon Williamsafb1aed2018-05-16 22:58:221436 ret |= match_explicit_lhs(src, item, NULL, NULL);
Jeff Kingba928c12014-03-05 19:04:541437 }
1438
Jeff Kingba928c12014-03-05 19:04:541439 return ret;
1440}
1441
1442/*
Junio C Hamano29753cd2011-09-09 18:54:581443 * 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 Hamano54a8ad92007-06-09 06:22:581449 */
Junio C Hamano29753cd2011-09-09 18:54:581450int match_push_refs(struct ref *src, struct ref **dst,
Brandon Williams5c7ec842018-05-16 22:58:211451 struct refspec *rs, int flags)
Daniel Barkalow6b628162007-05-12 15:45:591452{
Andy Whitcroft28b9d6e2007-11-09 23:32:101453 int send_all = flags & MATCH_REFS_ALL;
1454 int send_mirror = flags & MATCH_REFS_MIRROR;
Felipe Contreras6ddba5e2012-02-22 22:43:411455 int send_prune = flags & MATCH_REFS_PRUNE;
Jay Soffian5f48cb92009-02-25 08:32:171456 int errs;
Felipe Contrerasb1d8b1f2012-02-22 22:43:381457 struct ref *ref, **dst_tail = tail_ref(dst);
Brandon Caseyf1bd15a2013-07-08 08:58:391458 struct string_list dst_ref_index = STRING_LIST_INIT_NODUP;
Daniel Barkalow6b628162007-05-12 15:45:591459
Brandon Williams5c7ec842018-05-16 22:58:211460 /* 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 Barkalow6b628162007-05-12 15:45:591465
1466 /* pick the remainder */
Felipe Contrerasb1d8b1f2012-02-22 22:43:381467 for (ref = src; ref; ref = ref->next) {
Brandon Caseyf1bd15a2013-07-08 08:58:391468 struct string_list_item *dst_item;
Daniel Barkalow6b628162007-05-12 15:45:591469 struct ref *dst_peer;
Brandon Williams0ad4a5f2018-05-16 22:57:491470 const struct refspec_item *pat = NULL;
Alex Riesen6e66bf32007-06-07 23:43:051471 char *dst_name;
Felipe Contrerasdb70a042012-02-22 22:43:391472
Brandon Williams5c7ec842018-05-16 22:58:211473 dst_name = get_ref_match(rs, ref, send_mirror, FROM_SRC, &pat);
Felipe Contrerasdb70a042012-02-22 22:43:391474 if (!dst_name)
Paolo Bonzinia83619d2008-04-28 15:32:121475 continue;
1476
Brandon Caseyf1bd15a2013-07-08 08:58:391477 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 Bonzinia83619d2008-04-28 15:32:121482 if (dst_peer) {
1483 if (dst_peer->peer_ref)
1484 /* We're already sending something to this ref. */
1485 goto free_name;
Paolo Bonzinia83619d2008-04-28 15:32:121486 } 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 Lebar01689902014-03-31 22:11:461491 * --all or --mirror.
Paolo Bonzinia83619d2008-04-28 15:32:121492 */
1493 goto free_name;
1494
Daniel Barkalow6b628162007-05-12 15:45:591495 /* Create a new one and link it */
Clemens Buchacher6d2bf962009-05-31 14:26:481496 dst_peer = make_linked_ref(dst_name, &dst_tail);
brian m. carlsonf4e54d02015-11-10 02:22:201497 oidcpy(&dst_peer->new_oid, &ref->new_oid);
Brandon Caseyf1bd15a2013-07-08 08:58:391498 string_list_insert(&dst_ref_index,
1499 dst_peer->name)->util = dst_peer;
Daniel Barkalow6b628162007-05-12 15:45:591500 }
Felipe Contrerasb1d8b1f2012-02-22 22:43:381501 dst_peer->peer_ref = copy_ref(ref);
Paolo Bonzinia83619d2008-04-28 15:32:121502 dst_peer->force = pat->force;
Alex Riesen6e66bf32007-06-07 23:43:051503 free_name:
1504 free(dst_name);
Daniel Barkalow6b628162007-05-12 15:45:591505 }
Junio C Hamanoc2aba152013-03-04 20:09:501506
Brandon Caseyf1bd15a2013-07-08 08:58:391507 string_list_clear(&dst_ref_index, 0);
1508
Junio C Hamanoc2aba152013-03-04 20:09:501509 if (flags & MATCH_REFS_FOLLOW_TAGS)
1510 add_missing_tags(src, dst, &dst_tail);
1511
Felipe Contreras6ddba5e2012-02-22 22:43:411512 if (send_prune) {
Brandon Caseyf1bd15a2013-07-08 08:58:391513 struct string_list src_ref_index = STRING_LIST_INIT_NODUP;
Felipe Contreras6ddba5e2012-02-22 22:43:411514 /* 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 Williams5c7ec842018-05-16 22:58:211522 src_name = get_ref_match(rs, ref, send_mirror, FROM_DST, NULL);
Felipe Contreras6ddba5e2012-02-22 22:43:411523 if (src_name) {
Brandon Caseyf1bd15a2013-07-08 08:58:391524 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 Contreras6ddba5e2012-02-22 22:43:411528 ref->peer_ref = alloc_delete_ref();
1529 free(src_name);
1530 }
1531 }
Brandon Caseyf1bd15a2013-07-08 08:58:391532 string_list_clear(&src_ref_index, 0);
Felipe Contreras6ddba5e2012-02-22 22:43:411533 }
Brandon Williams8ca69372018-05-16 22:57:571534
Jacob Kellerc0192df2020-09-30 21:25:291535 *dst = apply_negative_refspecs(*dst, rs);
1536
Jay Soffian5f48cb92009-02-25 08:32:171537 if (errs)
1538 return -1;
Daniel Barkalow6b628162007-05-12 15:45:591539 return 0;
1540}
Daniel Barkalowcf818342007-09-11 03:02:561541
Tay Ray Chuan20e8b462010-01-08 02:12:421542void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
Junio C Hamano631b5ef2013-07-08 21:42:401543 int force_update)
Tay Ray Chuan20e8b462010-01-08 02:12:421544{
1545 struct ref *ref;
1546
1547 for (ref = remote_refs; ref; ref = ref->next) {
Chris Rorvick8c5f6f72012-11-30 01:41:361548 int force_ref_update = ref->force || force_update;
Junio C Hamano631b5ef2013-07-08 21:42:401549 int reject_reason = 0;
Chris Rorvick8c5f6f72012-11-30 01:41:361550
Tay Ray Chuan20e8b462010-01-08 02:12:421551 if (ref->peer_ref)
brian m. carlsonf4e54d02015-11-10 02:22:201552 oidcpy(&ref->new_oid, &ref->peer_ref->new_oid);
Tay Ray Chuan20e8b462010-01-08 02:12:421553 else if (!send_mirror)
1554 continue;
1555
brian m. carlsonf4e54d02015-11-10 02:22:201556 ref->deletion = is_null_oid(&ref->new_oid);
Tay Ray Chuan20e8b462010-01-08 02:12:421557 if (!ref->deletion &&
Jeff King4a7e27e2018-08-28 21:22:401558 oideq(&ref->old_oid, &ref->new_oid)) {
Tay Ray Chuan20e8b462010-01-08 02:12:421559 ref->status = REF_STATUS_UPTODATE;
1560 continue;
1561 }
1562
Chris Rorvicka272b282012-11-30 01:41:401563 /*
Andrew Wheelerb2e93f82016-01-29 23:18:421564 * If the remote ref has moved and is now different
1565 * from what we expect, reject any push.
Junio C Hamano631b5ef2013-07-08 21:42:401566 *
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 King9001dc22018-08-28 21:22:481573 if (!oideq(&ref->old_oid, &ref->old_oid_expect))
Junio C Hamano631b5ef2013-07-08 21:42:401574 reject_reason = REF_STATUS_REJECT_STALE;
Andrew Wheelerb2e93f82016-01-29 23:18:421575 else
1576 /* If the ref isn't stale then force the update. */
1577 force_ref_update = 1;
Junio C Hamano631b5ef2013-07-08 21:42:401578 }
1579
1580 /*
Andrew Wheelerb2e93f82016-01-29 23:18:421581 * If the update isn't already rejected then check
1582 * the usual "must fast-forward" rules.
Junio C Hamano631b5ef2013-07-08 21:42:401583 *
Junio C Hamano256b9d72013-01-16 21:02:271584 * 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 Chuan20e8b462010-01-08 02:12:421587 *
Chris Rorvicka272b282012-11-30 01:41:401588 * (1) the remote reference B does not exist
Tay Ray Chuan20e8b462010-01-08 02:12:421589 *
Chris Rorvicka272b282012-11-30 01:41:401590 * (2) the remote reference B is being removed (i.e.,
1591 * pushing :B where no source is specified)
Tay Ray Chuan20e8b462010-01-08 02:12:421592 *
Junio C Hamano256b9d72013-01-16 21:02:271593 * (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 Chuan20e8b462010-01-08 02:12:421596 *
Chris Rorvicka272b282012-11-30 01:41:401597 * (4) it is forced using the +A:B notation, or by
1598 * passing the --force argument
Tay Ray Chuan20e8b462010-01-08 02:12:421599 */
1600
Andrew Wheelerb2e93f82016-01-29 23:18:421601 if (!reject_reason && !ref->deletion && !is_null_oid(&ref->old_oid)) {
Christian Couder59556542013-11-30 20:55:401602 if (starts_with(ref->name, "refs/tags/"))
Junio C Hamano631b5ef2013-07-08 21:42:401603 reject_reason = REF_STATUS_REJECT_ALREADY_EXISTS;
brian m. carlsonf4e54d02015-11-10 02:22:201604 else if (!has_object_file(&ref->old_oid))
Junio C Hamano631b5ef2013-07-08 21:42:401605 reject_reason = REF_STATUS_REJECT_FETCH_FIRST;
Stefan Beller21e1ee82018-06-29 01:21:571606 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 Hamano631b5ef2013-07-08 21:42:401608 reject_reason = REF_STATUS_REJECT_NEEDS_FORCE;
brian m. carlson6f3d57b2015-11-10 02:22:251609 else if (!ref_newer(&ref->new_oid, &ref->old_oid))
Junio C Hamano631b5ef2013-07-08 21:42:401610 reject_reason = REF_STATUS_REJECT_NONFASTFORWARD;
Tay Ray Chuan20e8b462010-01-08 02:12:421611 }
Junio C Hamano631b5ef2013-07-08 21:42:401612
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 Chuan20e8b462010-01-08 02:12:421621 }
1622}
1623
Junio C Hamano05e73682014-10-14 21:42:041624static void set_merge(struct branch *ret)
1625{
Jeff King9e3751d2015-05-21 04:45:131626 struct remote *remote;
Junio C Hamano05e73682014-10-14 21:42:041627 char *ref;
brian m. carlsonfcd30b12015-11-10 02:22:301628 struct object_id oid;
Junio C Hamano05e73682014-10-14 21:42:041629 int i;
1630
Jeff Kingee2499f2015-05-21 04:45:091631 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 King9e3751d2015-05-21 04:45:131644 remote = remote_get(ret->remote_name);
1645
Junio C Hamano05e73682014-10-14 21:42:041646 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 King9e3751d2015-05-21 04:45:131650 if (!remote_find_tracking(remote, ret->merge[i]) ||
Junio C Hamano05e73682014-10-14 21:42:041651 strcmp(ret->remote_name, "."))
1652 continue;
1653 if (dwim_ref(ret->merge_name[i], strlen(ret->merge_name[i]),
Jonathan Tanf24c30e2020-09-01 22:28:091654 &oid, &ref, 0) == 1)
Junio C Hamano05e73682014-10-14 21:42:041655 ret->merge[i]->dst = ref;
1656 else
1657 ret->merge[i]->dst = xstrdup(ret->merge_name[i]);
1658 }
1659}
1660
Daniel Barkalowcf818342007-09-11 03:02:561661struct 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 King021ba322020-04-10 19:43:411669 ret = make_branch(name, strlen(name));
Jeff Kingee2499f2015-05-21 04:45:091670 set_merge(ret);
Daniel Barkalowcf818342007-09-11 03:02:561671 return ret;
1672}
1673
1674int branch_has_merge_config(struct branch *branch)
1675{
1676 return branch && !!branch->merge;
1677}
1678
Shawn O. Pearce85682c12007-09-18 08:54:531679int branch_merge_matches(struct branch *branch,
1680 int i,
1681 const char *refname)
Daniel Barkalowcf818342007-09-11 03:02:561682{
Shawn O. Pearce85682c12007-09-18 08:54:531683 if (!branch || i < 0 || i >= branch->merge_nr)
Daniel Barkalowcf818342007-09-11 03:02:561684 return 0;
Michael Haggerty54457fe2014-01-14 03:16:071685 return refname_match(branch->merge[i]->src, refname);
Daniel Barkalowcf818342007-09-11 03:02:561686}
Daniel Barkalowd71ab172007-09-11 03:03:081687
Jeff King060e7762016-04-25 21:15:231688__attribute__((format (printf,2,3)))
Jeff King3a429d02015-05-21 04:45:321689static const char *error_buf(struct strbuf *err, const char *fmt, ...)
Jeff Kinga9f9f8c2015-05-21 04:45:281690{
Jeff King3a429d02015-05-21 04:45:321691 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
1700const 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 King1ca41a12015-05-22 00:46:431704
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 King3a429d02015-05-21 04:45:321711 if (!ref_exists(branch->refname))
1712 return error_buf(err, _("no such branch: '%s'"),
1713 branch->name);
Jeff King1ca41a12015-05-22 00:46:431714 return error_buf(err,
1715 _("no upstream configured for branch '%s'"),
1716 branch->name);
1717 }
1718
1719 if (!branch->merge[0]->dst)
Jeff King3a429d02015-05-21 04:45:321720 return error_buf(err,
1721 _("upstream branch '%s' not stored as a remote-tracking branch"),
1722 branch->merge[0]->src);
Jeff King3a429d02015-05-21 04:45:321723
Jeff Kinga9f9f8c2015-05-21 04:45:281724 return branch->merge[0]->dst;
1725}
1726
Jeff Kinge291c752015-05-21 04:45:361727static const char *tracking_for_push_dest(struct remote *remote,
1728 const char *refname,
1729 struct strbuf *err)
1730{
1731 char *ret;
1732
Brandon Williamsd0004142018-05-16 22:58:111733 ret = apply_refspecs(&remote->fetch, refname);
Jeff Kinge291c752015-05-21 04:45:361734 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
1741static const char *branch_get_push_1(struct branch *branch, struct strbuf *err)
1742{
1743 struct remote *remote;
1744
Jeff Kinge291c752015-05-21 04:45:361745 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 Williams6bdb3042018-05-16 22:58:001751 if (remote->push.nr) {
Jeff Kinge291c752015-05-21 04:45:361752 char *dst;
1753 const char *ret;
1754
Brandon Williamsd0004142018-05-16 22:58:111755 dst = apply_refspecs(&remote->push, branch->refname);
Jeff Kinge291c752015-05-21 04:45:361756 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 Schindelin033abf92018-05-02 09:38:391798 BUG("unhandled push situation");
Jeff Kinge291c752015-05-21 04:45:361799}
1800
1801const char *branch_get_push(struct branch *branch, struct strbuf *err)
1802{
Kyle Meyerb10731f2017-01-07 01:12:151803 if (!branch)
1804 return error_buf(err, _("HEAD does not point to a branch"));
1805
Jeff Kinge291c752015-05-21 04:45:361806 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 Hamanof8fb9712012-12-11 21:00:521811static int ignore_symref_update(const char *refname)
1812{
Junio C Hamanof8fb9712012-12-11 21:00:521813 int flag;
1814
René Scharfe744c0402017-09-23 09:45:041815 if (!resolve_ref_unsafe(refname, 0, NULL, &flag))
Junio C Hamanof8fb9712012-12-11 21:00:521816 return 0; /* non-existing refs are OK */
1817 return (flag & REF_ISSYMREF);
1818}
1819
Michael Haggertyf166db22013-10-30 05:32:561820/*
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 Barkalow45773702007-10-30 01:05:401827static struct ref *get_expanded_map(const struct ref *remote_refs,
Brandon Williams0ad4a5f2018-05-16 22:57:491828 const struct refspec_item *refspec)
Daniel Barkalowd71ab172007-09-11 03:03:081829{
Daniel Barkalow45773702007-10-30 01:05:401830 const struct ref *ref;
Daniel Barkalowd71ab172007-09-11 03:03:081831 struct ref *ret = NULL;
1832 struct ref **tail = &ret;
1833
Daniel Barkalowd71ab172007-09-11 03:03:081834 for (ref = remote_refs; ref; ref = ref->next) {
Michael Haggertye31a17f2013-10-30 05:32:571835 char *expn_name = NULL;
1836
Daniel Barkalowd71ab172007-09-11 03:03:081837 if (strchr(ref->name, '^'))
1838 continue; /* a dereference item */
Daniel Barkalowe9282132009-03-07 06:11:341839 if (match_name_with_pattern(refspec->src, ref->name,
Junio C Hamanof8fb9712012-12-11 21:00:521840 refspec->dst, &expn_name) &&
1841 !ignore_symref_update(expn_name)) {
Daniel Barkalowd71ab172007-09-11 03:03:081842 struct ref *cpy = copy_ref(ref);
Daniel Barkalowd71ab172007-09-11 03:03:081843
Daniel Barkalowe9282132009-03-07 06:11:341844 cpy->peer_ref = alloc_ref(expn_name);
Daniel Barkalowd71ab172007-09-11 03:03:081845 if (refspec->force)
1846 cpy->peer_ref->force = 1;
1847 *tail = cpy;
1848 tail = &cpy->next;
1849 }
Michael Haggertye31a17f2013-10-30 05:32:571850 free(expn_name);
Daniel Barkalowd71ab172007-09-11 03:03:081851 }
1852
1853 return ret;
1854}
1855
Daniel Barkalow45773702007-10-30 01:05:401856static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
Daniel Barkalowd71ab172007-09-11 03:03:081857{
Daniel Barkalow45773702007-10-30 01:05:401858 const struct ref *ref;
Junio C Hamano60650a42018-08-01 16:22:371859 const struct ref *best_match = NULL;
1860 int best_score = 0;
1861
Daniel Barkalowd71ab172007-09-11 03:03:081862 for (ref = refs; ref; ref = ref->next) {
Junio C Hamano60650a42018-08-01 16:22:371863 int score = refname_match(name, ref->name);
1864
1865 if (best_score < score) {
1866 best_match = ref;
1867 best_score = score;
1868 }
Daniel Barkalowd71ab172007-09-11 03:03:081869 }
Junio C Hamano60650a42018-08-01 16:22:371870 return best_match;
Daniel Barkalowd71ab172007-09-11 03:03:081871}
1872
Daniel Barkalow45773702007-10-30 01:05:401873struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
Daniel Barkalowd71ab172007-09-11 03:03:081874{
Daniel Barkalow45773702007-10-30 01:05:401875 const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
Daniel Barkalowd71ab172007-09-11 03:03:081876
1877 if (!ref)
Junio C Hamano9ad7c5a2007-10-27 06:09:481878 return NULL;
Daniel Barkalowd71ab172007-09-11 03:03:081879
1880 return copy_ref(ref);
1881}
1882
1883static struct ref *get_local_ref(const char *name)
1884{
Clemens Buchacher3eb96992009-06-17 13:38:361885 if (!name || name[0] == '\0')
Daniel Barkalowd71ab172007-09-11 03:03:081886 return NULL;
1887
Christian Couder59556542013-11-30 20:55:401888 if (starts_with(name, "refs/"))
René Scharfe59c69c02008-10-18 08:44:181889 return alloc_ref(name);
Daniel Barkalowd71ab172007-09-11 03:03:081890
Christian Couder59556542013-11-30 20:55:401891 if (starts_with(name, "heads/") ||
1892 starts_with(name, "tags/") ||
1893 starts_with(name, "remotes/"))
René Scharfe80097682008-10-18 08:37:401894 return alloc_ref_with_prefix("refs/", 5, name);
Daniel Barkalowd71ab172007-09-11 03:03:081895
René Scharfe80097682008-10-18 08:37:401896 return alloc_ref_with_prefix("refs/heads/", 11, name);
Daniel Barkalowd71ab172007-09-11 03:03:081897}
1898
Daniel Barkalow45773702007-10-30 01:05:401899int get_fetch_map(const struct ref *remote_refs,
Brandon Williams0ad4a5f2018-05-16 22:57:491900 const struct refspec_item *refspec,
Junio C Hamano9ad7c5a2007-10-27 06:09:481901 struct ref ***tail,
1902 int missing_ok)
Daniel Barkalowd71ab172007-09-11 03:03:081903{
Daniel Barkalowef00d152008-03-18 02:05:231904 struct ref *ref_map, **rmp;
Daniel Barkalowd71ab172007-09-11 03:03:081905
Jacob Kellerc0192df2020-09-30 21:25:291906 if (refspec->negative)
1907 return 0;
1908
Daniel Barkalowd71ab172007-09-11 03:03:081909 if (refspec->pattern) {
1910 ref_map = get_expanded_map(remote_refs, refspec);
1911 } else {
Junio C Hamano9ad7c5a2007-10-27 06:09:481912 const char *name = refspec->src[0] ? refspec->src : "HEAD";
Daniel Barkalowd71ab172007-09-11 03:03:081913
Junio C Hamano6e7b66e2013-01-29 22:02:151914 if (refspec->exact_sha1) {
1915 ref_map = alloc_ref(name);
brian m. carlsonf4e54d02015-11-10 02:22:201916 get_oid_hex(name, &ref_map->old_oid);
Brandon Williams73302052018-06-27 22:30:231917 ref_map->exact_oid = 1;
Junio C Hamano6e7b66e2013-01-29 22:02:151918 } else {
1919 ref_map = get_remote_ref(remote_refs, name);
1920 }
Junio C Hamano9ad7c5a2007-10-27 06:09:481921 if (!missing_ok && !ref_map)
Nguyễn Thái Ngọc Duy0b9c3af2018-11-10 05:16:091922 die(_("couldn't find remote ref %s"), name);
Junio C Hamano9ad7c5a2007-10-27 06:09:481923 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 Barkalowd71ab172007-09-11 03:03:081928 }
1929
Daniel Barkalowef00d152008-03-18 02:05:231930 for (rmp = &ref_map; *rmp; ) {
1931 if ((*rmp)->peer_ref) {
Christian Couder59556542013-11-30 20:55:401932 if (!starts_with((*rmp)->peer_ref->name, "refs/") ||
Junio C Hamano5c08c1f2012-05-04 22:35:181933 check_refname_format((*rmp)->peer_ref->name, 0)) {
Daniel Barkalowef00d152008-03-18 02:05:231934 struct ref *ignore = *rmp;
Nguyễn Thái Ngọc Duy0b9c3af2018-11-10 05:16:091935 error(_("* Ignoring funny ref '%s' locally"),
Daniel Barkalowef00d152008-03-18 02:05:231936 (*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 Barkalowd71ab172007-09-11 03:03:081944 }
1945
Alex Riesen8f70a762007-10-12 20:40:041946 if (ref_map)
1947 tail_link_ref(ref_map, tail);
Daniel Barkalowd71ab172007-09-11 03:03:081948
1949 return 0;
1950}
Daniel Barkalowbe885d92008-04-26 19:53:121951
1952int 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. carlsonf4e54d02015-11-10 02:22:201958 oidcpy(&ref->old_oid, &list->old_oid);
Daniel Barkalowbe885d92008-04-26 19:53:121959 return 0;
1960 }
1961 return 1;
1962}
Junio C Hamano6d21bf92008-07-02 07:51:181963
Junio C Hamano6d21bf92008-07-02 07:51:181964/*
Damien Robertc646d092019-04-16 12:16:461965 * Compute the commit ahead/behind values for the pair branch_name, base.
Jeff Hostetlerd7d1b492018-01-09 18:50:151966 *
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 Robertc646d092019-04-16 12:16:461972 * 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 Hamano6d21bf92008-07-02 07:51:181975 */
Damien Robertc646d092019-04-16 12:16:461976
1977static 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 Hamano6d21bf92008-07-02 07:51:181980{
brian m. carlsonfcd30b12015-11-10 02:22:301981 struct object_id oid;
Junio C Hamano6d21bf92008-07-02 07:51:181982 struct commit *ours, *theirs;
Junio C Hamano6d21bf92008-07-02 07:51:181983 struct rev_info revs;
Jeff Kingc972bf42020-07-28 20:25:121984 struct strvec argv = STRVEC_INIT;
Junio C Hamano6d21bf92008-07-02 07:51:181985
Jiang Xinf2e08732013-08-26 07:02:481986 /* Cannot stat if what we used to build on no longer exists */
brian m. carlson34c290a2017-10-15 22:06:561987 if (read_ref(base, &oid))
Jiang Xinf2e08732013-08-26 07:02:481988 return -1;
Stefan Beller2122f672018-06-29 01:21:581989 theirs = lookup_commit_reference(the_repository, &oid);
Junio C Hamano6d21bf92008-07-02 07:51:181990 if (!theirs)
Jiang Xinf2e08732013-08-26 07:02:481991 return -1;
Junio C Hamano6d21bf92008-07-02 07:51:181992
Damien Robertc646d092019-04-16 12:16:461993 if (read_ref(branch_name, &oid))
Jiang Xinf2e08732013-08-26 07:02:481994 return -1;
Stefan Beller2122f672018-06-29 01:21:581995 ours = lookup_commit_reference(the_repository, &oid);
Junio C Hamano6d21bf92008-07-02 07:51:181996 if (!ours)
Jiang Xinf2e08732013-08-26 07:02:481997 return -1;
Junio C Hamano6d21bf92008-07-02 07:51:181998
Jeff Hostetlerd7d1b492018-01-09 18:50:151999 *num_theirs = *num_ours = 0;
2000
Junio C Hamano6d21bf92008-07-02 07:51:182001 /* are we the same? */
Jeff Hostetlerd7d1b492018-01-09 18:50:152002 if (theirs == ours)
Jeff King979cb242015-05-22 00:49:112003 return 0;
Jeff Hostetlerd7d1b492018-01-09 18:50:152004 if (abf == AHEAD_BEHIND_QUICK)
2005 return 1;
Jeff Hostetlerfd9b5442018-01-09 18:50:162006 if (abf != AHEAD_BEHIND_FULL)
Damien Robertc646d092019-04-16 12:16:462007 BUG("stat_branch_pair: invalid abf '%d'", abf);
Junio C Hamano6d21bf92008-07-02 07:51:182008
Junio C Hamano8fbf8792009-04-21 23:32:182009 /* Run "rev-list --left-right ours...theirs" internally... */
Jeff Kingc972bf42020-07-28 20:25:122010 strvec_push(&argv, ""); /* ignored */
2011 strvec_push(&argv, "--left-right");
2012 strvec_pushf(&argv, "%s...%s",
Jeff Kingf6d89422020-07-28 20:26:312013 oid_to_hex(&ours->object.oid),
2014 oid_to_hex(&theirs->object.oid));
Jeff Kingc972bf42020-07-28 20:25:122015 strvec_push(&argv, "--");
Junio C Hamano6d21bf92008-07-02 07:51:182016
Nguyễn Thái Ngọc Duy2abf3502018-09-21 15:57:382017 repo_init_revisions(the_repository, &revs, NULL);
Jeff Kingd70a9eb2020-07-29 00:37:202018 setup_revisions(argv.nr, argv.v, &revs, NULL);
Stefan Beller81c3ce32014-08-10 21:33:262019 if (prepare_revision_walk(&revs))
Nguyễn Thái Ngọc Duy0b9c3af2018-11-10 05:16:092020 die(_("revision walk setup failed"));
Junio C Hamano6d21bf92008-07-02 07:51:182021
2022 /* ... and count the commits on each side. */
Junio C Hamano6d21bf92008-07-02 07:51:182023 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 Hamanoc0234b22008-07-03 19:09:482032
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 King0b282cc2015-09-24 21:07:582036
Jeff Kingc972bf42020-07-28 20:25:122037 strvec_clear(&argv);
Jeff Hostetlerd7d1b492018-01-09 18:50:152038 return 1;
Junio C Hamano6d21bf92008-07-02 07:51:182039}
2040
2041/*
Damien Robertc646d092019-04-16 12:16:462042 * 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 */
2060int 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 Hamano6d21bf92008-07-02 07:51:182078 * Return true when there is anything to report, otherwise false.
2079 */
Jeff Hostetlerf39a7572018-01-09 18:50:182080int format_tracking_info(struct branch *branch, struct strbuf *sb,
2081 enum ahead_behind_flags abf)
Junio C Hamano6d21bf92008-07-02 07:51:182082{
Jeff Hostetlerf39a7572018-01-09 18:50:182083 int ours, theirs, sti;
Jeff King979cb242015-05-22 00:49:112084 const char *full_base;
Stefan Beller2f50bab2014-08-10 19:43:332085 char *base;
Jiang Xinf2e08732013-08-26 07:02:482086 int upstream_is_gone = 0;
Junio C Hamano6d21bf92008-07-02 07:51:182087
Damien Robertc646d092019-04-16 12:16:462088 sti = stat_tracking_info(branch, &ours, &theirs, &full_base, 0, abf);
Jeff Hostetlerf39a7572018-01-09 18:50:182089 if (sti < 0) {
Jeff King979cb242015-05-22 00:49:112090 if (!full_base)
2091 return 0;
Jiang Xinf2e08732013-08-26 07:02:482092 upstream_is_gone = 1;
Jiang Xinf2e08732013-08-26 07:02:482093 }
Junio C Hamano6d21bf92008-07-02 07:51:182094
Jeff King979cb242015-05-22 00:49:112095 base = shorten_unambiguous_ref(full_base, 0);
Jiang Xinf2e08732013-08-26 07:02:482096 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é Scharfea22ae752016-09-15 18:31:002101 strbuf_addstr(sb,
Jiang Xinf2e08732013-08-26 07:02:482102 _(" (use \"git branch --unset-upstream\" to fixup)\n"));
Jeff Hostetlerf39a7572018-01-09 18:50:182103 } else if (!sti) {
Jiang Xinf2234592013-08-26 07:02:492104 strbuf_addf(sb,
Martin Ågren7560f542017-08-23 17:49:352105 _("Your branch is up to date with '%s'.\n"),
Jiang Xinf2234592013-08-26 07:02:492106 base);
Jeff Hostetlerf39a7572018-01-09 18:50:182107 } 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 Xinf2e08732013-08-26 07:02:482114 } else if (!theirs) {
Jiang Xin8a5b7492012-02-02 02:02:232115 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 Xinf2e08732013-08-26 07:02:482118 ours),
2119 base, ours);
Jeff King491e3072012-12-03 06:16:572120 if (advice_status_hints)
René Scharfea22ae752016-09-15 18:31:002121 strbuf_addstr(sb,
Jeff King491e3072012-12-03 06:16:572122 _(" (use \"git push\" to publish your local commits)\n"));
Jiang Xinf2e08732013-08-26 07:02:482123 } else if (!ours) {
Jiang Xin8a5b7492012-02-02 02:02:232124 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 Xinf2e08732013-08-26 07:02:482129 theirs),
2130 base, theirs);
Jeff King491e3072012-12-03 06:16:572131 if (advice_status_hints)
René Scharfea22ae752016-09-15 18:31:002132 strbuf_addstr(sb,
Jeff King491e3072012-12-03 06:16:572133 _(" (use \"git pull\" to update your local branch)\n"));
Matthieu Moyc190ced2012-11-15 10:45:002134 } else {
Jiang Xin8a5b7492012-02-02 02:02:232135 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 Duyf54bea42016-05-03 00:12:302142 ours + theirs),
Jiang Xinf2e08732013-08-26 07:02:482143 base, ours, theirs);
Jeff King491e3072012-12-03 06:16:572144 if (advice_status_hints)
René Scharfea22ae752016-09-15 18:31:002145 strbuf_addstr(sb,
Jeff King491e3072012-12-03 06:16:572146 _(" (use \"git pull\" to merge the remote branch into yours)\n"));
Matthieu Moyc190ced2012-11-15 10:45:002147 }
Stefan Beller2f50bab2014-08-10 19:43:332148 free(base);
Junio C Hamano6d21bf92008-07-02 07:51:182149 return 1;
2150}
Jay Soffian454e2022009-02-25 08:32:112151
Michael Haggerty455ade62015-05-25 18:39:012152static int one_local_ref(const char *refname, const struct object_id *oid,
2153 int flag, void *cb_data)
Jay Soffian454e2022009-02-25 08:32:112154{
2155 struct ref ***local_tail = cb_data;
2156 struct ref *ref;
Jay Soffian454e2022009-02-25 08:32:112157
2158 /* we already know it starts with refs/ to get here */
Michael Haggerty8d9c5012011-09-15 21:10:252159 if (check_refname_format(refname + 5, 0))
Jay Soffian454e2022009-02-25 08:32:112160 return 0;
2161
Jeff King96ffc062016-02-22 22:44:322162 ref = alloc_ref(refname);
brian m. carlsonf4e54d02015-11-10 02:22:202163 oidcpy(&ref->new_oid, oid);
Jay Soffian454e2022009-02-25 08:32:112164 **local_tail = ref;
2165 *local_tail = &ref->next;
2166 return 0;
2167}
2168
2169struct ref *get_local_heads(void)
2170{
Nguyễn Thái Ngọc Duy55f05662009-04-16 22:16:232171 struct ref *local_refs = NULL, **local_tail = &local_refs;
Michael Haggerty2b2a5be2015-05-25 18:38:282172
Jay Soffian454e2022009-02-25 08:32:112173 for_each_ref(one_local_ref, &local_tail);
2174 return local_refs;
2175}
Jay Soffian8ef51732009-02-25 08:32:132176
Jay Soffian4229f1f2009-02-27 19:10:052177struct ref *guess_remote_head(const struct ref *head,
2178 const struct ref *refs,
2179 int all)
Jay Soffian8ef51732009-02-25 08:32:132180{
Jay Soffian8ef51732009-02-25 08:32:132181 const struct ref *r;
Jay Soffian4229f1f2009-02-27 19:10:052182 struct ref *list = NULL;
2183 struct ref **tail = &list;
Jay Soffian8ef51732009-02-25 08:32:132184
Jay Soffian6cb4e6c2009-02-25 08:32:142185 if (!head)
Jay Soffian8ef51732009-02-25 08:32:132186 return NULL;
2187
Jeff Kingfbb074c2009-02-27 19:10:062188 /*
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 Schindelina4712142020-06-24 14:46:352196 /* If a remote branch exists with the default branch name, let's use it. */
Jay Soffian4229f1f2009-02-27 19:10:052197 if (!all) {
Johannes Schindelina4712142020-06-24 14:46:352198 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 Soffian4229f1f2009-02-27 19:10:052206 r = find_ref_by_name(refs, "refs/heads/master");
Jeff King4a7e27e2018-08-28 21:22:402207 if (r && oideq(&r->old_oid, &head->old_oid))
Jay Soffian4229f1f2009-02-27 19:10:052208 return copy_ref(r);
2209 }
Jay Soffian8ef51732009-02-25 08:32:132210
2211 /* Look for another ref that points there */
Jay Soffian4229f1f2009-02-27 19:10:052212 for (r = refs; r; r = r->next) {
Jeff King61adfd32011-06-03 05:11:132213 if (r != head &&
Christian Couder59556542013-11-30 20:55:402214 starts_with(r->name, "refs/heads/") &&
Jeff King4a7e27e2018-08-28 21:22:402215 oideq(&r->old_oid, &head->old_oid)) {
Jay Soffian4229f1f2009-02-27 19:10:052216 *tail = copy_ref(r);
2217 tail = &((*tail)->next);
2218 if (!all)
2219 break;
2220 }
2221 }
Jay Soffian8ef51732009-02-25 08:32:132222
Jay Soffian4229f1f2009-02-27 19:10:052223 return list;
Jay Soffian8ef51732009-02-25 08:32:132224}
Jay Soffianf2ef6072009-11-10 05:03:312225
2226struct stale_heads_info {
Jay Soffianf2ef6072009-11-10 05:03:312227 struct string_list *ref_names;
2228 struct ref **stale_refs_tail;
Brandon Williamsa2ac50c2018-05-16 22:58:102229 struct refspec *rs;
Jay Soffianf2ef6072009-11-10 05:03:312230};
2231
Michael Haggerty455ade62015-05-25 18:39:012232static int get_stale_heads_cb(const char *refname, const struct object_id *oid,
2233 int flags, void *cb_data)
Jay Soffianf2ef6072009-11-10 05:03:312234{
2235 struct stale_heads_info *info = cb_data;
Carlos Martín Nietoe6f63712014-02-27 09:00:102236 struct string_list matches = STRING_LIST_INIT_DUP;
Brandon Williams0ad4a5f2018-05-16 22:57:492237 struct refspec_item query;
Carlos Martín Nietoe6f63712014-02-27 09:00:102238 int i, stale = 1;
Brandon Williams0ad4a5f2018-05-16 22:57:492239 memset(&query, 0, sizeof(struct refspec_item));
Carlos Martín Nietoed43de62011-10-15 05:04:252240 query.dst = (char *)refname;
2241
Brandon Williamsa2ac50c2018-05-16 22:58:102242 query_refspecs_multiple(info->rs, &query, &matches);
Carlos Martín Nietoe6f63712014-02-27 09:00:102243 if (matches.nr == 0)
2244 goto clean_exit; /* No matches */
Carlos Martín Nietoed43de62011-10-15 05:04:252245
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 Nietoe6f63712014-02-27 09:00:102249 * 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 Nietoed43de62011-10-15 05:04:252252 */
Carlos Martín Nietoe6f63712014-02-27 09:00:102253 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 Nietoed43de62011-10-15 05:04:252261 struct ref *ref = make_linked_ref(refname, &info->stale_refs_tail);
brian m. carlsonf4e54d02015-11-10 02:22:202262 oidcpy(&ref->new_oid, oid);
Jay Soffianf2ef6072009-11-10 05:03:312263 }
Carlos Martín Nietoed43de62011-10-15 05:04:252264
Carlos Martín Nietoe6f63712014-02-27 09:00:102265clean_exit:
2266 string_list_clear(&matches, 0);
Jay Soffianf2ef6072009-11-10 05:03:312267 return 0;
2268}
2269
Brandon Williamsa2ac50c2018-05-16 22:58:102270struct ref *get_stale_heads(struct refspec *rs, struct ref *fetch_map)
Jay Soffianf2ef6072009-11-10 05:03:312271{
2272 struct ref *ref, *stale_refs = NULL;
Thiago Farina183113a2010-07-04 19:46:192273 struct string_list ref_names = STRING_LIST_INIT_NODUP;
Jay Soffianf2ef6072009-11-10 05:03:312274 struct stale_heads_info info;
Michael Haggerty2b2a5be2015-05-25 18:38:282275
Jay Soffianf2ef6072009-11-10 05:03:312276 info.ref_names = &ref_names;
2277 info.stale_refs_tail = &stale_refs;
Brandon Williamsa2ac50c2018-05-16 22:58:102278 info.rs = rs;
Jay Soffianf2ef6072009-11-10 05:03:312279 for (ref = fetch_map; ref; ref = ref->next)
Julian Phillips1d2f80f2010-06-25 23:41:382280 string_list_append(&ref_names, ref->name);
Michael Haggerty3383e192014-11-25 08:02:352281 string_list_sort(&ref_names);
Jay Soffianf2ef6072009-11-10 05:03:312282 for_each_ref(get_stale_heads_cb, &info);
2283 string_list_clear(&ref_names, 0);
2284 return stale_refs;
2285}
Junio C Hamano28f5d172013-07-08 22:34:362286
2287/*
2288 * Compare-and-swap
2289 */
Junio C Hamanoa355b112015-01-14 22:58:442290static void clear_cas_option(struct push_cas_option *cas)
Junio C Hamano28f5d172013-07-08 22:34:362291{
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
2300static 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 Hamano86689762017-03-31 20:20:482312static int parse_push_cas_option(struct push_cas_option *cas, const char *arg, int unset)
Junio C Hamano28f5d172013-07-08 22:34:362313{
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 Keepingeee98e72016-07-26 20:44:442334 else if (!colon[1])
brian m. carlsonb8566f82017-07-13 23:49:212335 oidclr(&entry->expect);
2336 else if (get_oid(colon + 1, &entry->expect))
Nguyễn Thái Ngọc Duy0b9c3af2018-11-10 05:16:092337 return error(_("cannot parse expected object name '%s'"),
2338 colon + 1);
Junio C Hamano28f5d172013-07-08 22:34:362339 return 0;
2340}
2341
2342int 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 Hamano91048a92013-07-09 18:01:062346
2347int 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 */
2358static int remote_tracking(struct remote *remote, const char *refname,
brian m. carlsonfcd30b12015-11-10 02:22:302359 struct object_id *oid)
Junio C Hamano91048a92013-07-09 18:01:062360{
2361 char *dst;
2362
Brandon Williamsd0004142018-05-16 22:58:112363 dst = apply_refspecs(&remote->fetch, refname);
Junio C Hamano91048a92013-07-09 18:01:062364 if (!dst)
2365 return -1; /* no tracking ref for refname at remote */
brian m. carlson34c290a2017-10-15 22:06:562366 if (read_ref(dst, oid))
Junio C Hamano91048a92013-07-09 18:01:062367 return -1; /* we know what the tracking ref is but we cannot read it */
2368 return 0;
2369}
2370
2371static 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 Haggerty54457fe2014-01-14 03:16:072380 if (!refname_match(entry->refname, ref->name))
Junio C Hamano91048a92013-07-09 18:01:062381 continue;
2382 ref->expect_old_sha1 = 1;
2383 if (!entry->use_tracking)
brian m. carlsonb8566f82017-07-13 23:49:212384 oidcpy(&ref->old_oid_expect, &entry->expect);
brian m. carlsonfcd30b12015-11-10 02:22:302385 else if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
John Keeping64ac39a2016-07-26 20:44:452386 oidclr(&ref->old_oid_expect);
Junio C Hamano91048a92013-07-09 18:01:062387 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. carlsonfcd30b12015-11-10 02:22:302395 if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
John Keeping64ac39a2016-07-26 20:44:452396 oidclr(&ref->old_oid_expect);
Junio C Hamano91048a92013-07-09 18:01:062397}
2398
2399void 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}