remote.c 59.1 KB
Newer Older
1
#include "cache.h"
2
#include "config.h"
3 4
#include "remote.h"
#include "refs.h"
5 6 7
#include "commit.h"
#include "diff.h"
#include "revision.h"
8
#include "dir.h"
9
#include "tag.h"
10
#include "string-list.h"
11
#include "mergesort.h"
12
#include "argv-array.h"
13

F
Felipe Contreras 已提交
14 15
enum map_direction { FROM_SRC, FROM_DST };

16 17 18
static struct refspec s_tag_refspec = {
	0,
	1,
J
Junio C Hamano 已提交
19
	0,
20
	0,
D
Daniel Barkalow 已提交
21 22
	"refs/tags/*",
	"refs/tags/*"
23 24
};

25
/* See TAG_REFSPEC for the string version */
26 27
const struct refspec *tag_refspec = &s_tag_refspec;

28 29 30 31
struct counted_string {
	size_t len;
	const char *s;
};
32 33
struct rewrite {
	const char *base;
34 35
	size_t baselen;
	struct counted_string *instead_of;
36 37 38
	int instead_of_nr;
	int instead_of_alloc;
};
39 40 41 42 43
struct rewrites {
	struct rewrite **rewrite;
	int rewrite_alloc;
	int rewrite_nr;
};
44

45
static struct remote **remotes;
D
Daniel Barkalow 已提交
46 47
static int remotes_alloc;
static int remotes_nr;
48
static struct hashmap remotes_hash;
49

50
static struct branch **branches;
D
Daniel Barkalow 已提交
51 52
static int branches_alloc;
static int branches_nr;
53 54

static struct branch *current_branch;
55
static const char *pushremote_name;
56

57
static struct rewrites rewrites;
58
static struct rewrites rewrites_push;
59

60 61
static int valid_remote(const struct remote *remote)
{
62
	return (!!remote->url) || (!!remote->foreign_vcs);
63 64
}

65
static const char *alias_url(const char *url, struct rewrites *r)
66 67
{
	int i, j;
68 69 70 71 72
	struct counted_string *longest;
	int longest_i;

	longest = NULL;
	longest_i = -1;
73 74
	for (i = 0; i < r->rewrite_nr; i++) {
		if (!r->rewrite[i])
75
			continue;
76
		for (j = 0; j < r->rewrite[i]->instead_of_nr; j++) {
77
			if (starts_with(url, r->rewrite[i]->instead_of[j].s) &&
78
			    (!longest ||
79 80
			     longest->len < r->rewrite[i]->instead_of[j].len)) {
				longest = &(r->rewrite[i]->instead_of[j]);
81
				longest_i = i;
82 83 84
			}
		}
	}
85 86 87
	if (!longest)
		return url;

88
	return xstrfmt("%s%s", r->rewrite[longest_i]->base, url + longest->len);
89 90
}

91 92
static void add_push_refspec(struct remote *remote, const char *ref)
{
D
Daniel Barkalow 已提交
93 94 95 96
	ALLOC_GROW(remote->push_refspec,
		   remote->push_refspec_nr + 1,
		   remote->push_refspec_alloc);
	remote->push_refspec[remote->push_refspec_nr++] = ref;
97 98
}

99 100
static void add_fetch_refspec(struct remote *remote, const char *ref)
{
D
Daniel Barkalow 已提交
101 102 103 104
	ALLOC_GROW(remote->fetch_refspec,
		   remote->fetch_refspec_nr + 1,
		   remote->fetch_refspec_alloc);
	remote->fetch_refspec[remote->fetch_refspec_nr++] = ref;
105 106
}

107
static void add_url(struct remote *remote, const char *url)
108
{
D
Daniel Barkalow 已提交
109 110
	ALLOC_GROW(remote->url, remote->url_nr + 1, remote->url_alloc);
	remote->url[remote->url_nr++] = url;
111 112
}

113 114 115 116 117 118
static void add_pushurl(struct remote *remote, const char *pushurl)
{
	ALLOC_GROW(remote->pushurl, remote->pushurl_nr + 1, remote->pushurl_alloc);
	remote->pushurl[remote->pushurl_nr++] = pushurl;
}

119 120 121 122 123 124 125 126 127 128 129 130 131
static void add_pushurl_alias(struct remote *remote, const char *url)
{
	const char *pushurl = alias_url(url, &rewrites_push);
	if (pushurl != url)
		add_pushurl(remote, pushurl);
}

static void add_url_alias(struct remote *remote, const char *url)
{
	add_url(remote, alias_url(url, &rewrites));
	add_pushurl_alias(remote, url);
}

132 133 134 135 136
struct remotes_hash_key {
	const char *str;
	int len;
};

137
static int remotes_hash_cmp(const void *unused_cmp_data,
138 139 140
			    const void *entry,
			    const void *entry_or_key,
			    const void *keydata)
141
{
142 143 144 145
	const struct remote *a = entry;
	const struct remote *b = entry_or_key;
	const struct remotes_hash_key *key = keydata;

146 147 148 149 150 151 152 153 154
	if (key)
		return strncmp(a->name, key->str, key->len) || a->name[key->len];
	else
		return strcmp(a->name, b->name);
}

static inline void init_remotes_hash(void)
{
	if (!remotes_hash.cmpfn)
155
		hashmap_init(&remotes_hash, remotes_hash_cmp, NULL, 0);
156 157
}

158 159
static struct remote *make_remote(const char *name, int len)
{
160 161 162
	struct remote *ret, *replaced;
	struct remotes_hash_key lookup;
	struct hashmap_entry lookup_entry;
163

164 165 166 167 168 169 170 171 172 173
	if (!len)
		len = strlen(name);

	init_remotes_hash();
	lookup.str = name;
	lookup.len = len;
	hashmap_entry_init(&lookup_entry, memhash(name, len));

	if ((ret = hashmap_get(&remotes_hash, &lookup_entry, &lookup)) != NULL)
		return ret;
174

D
Daniel Barkalow 已提交
175
	ret = xcalloc(1, sizeof(struct remote));
176
	ret->prune = -1;  /* unspecified */
D
Daniel Barkalow 已提交
177 178
	ALLOC_GROW(remotes, remotes_nr + 1, remotes_alloc);
	remotes[remotes_nr++] = ret;
179 180 181 182 183
	ret->name = xstrndup(name, len);

	hashmap_entry_init(ret, lookup_entry.hash);
	replaced = hashmap_put(&remotes_hash, ret);
	assert(replaced == NULL);  /* no previous entry overwritten */
D
Daniel Barkalow 已提交
184
	return ret;
185 186
}

187 188
static void add_merge(struct branch *branch, const char *name)
{
D
Daniel Barkalow 已提交
189 190 191
	ALLOC_GROW(branch->merge_name, branch->merge_nr + 1,
		   branch->merge_alloc);
	branch->merge_name[branch->merge_nr++] = name;
192 193 194 195
}

static struct branch *make_branch(const char *name, int len)
{
D
Daniel Barkalow 已提交
196 197
	struct branch *ret;
	int i;
198

D
Daniel Barkalow 已提交
199 200 201 202 203
	for (i = 0; i < branches_nr; i++) {
		if (len ? (!strncmp(name, branches[i]->name, len) &&
			   !branches[i]->name[len]) :
		    !strcmp(name, branches[i]->name))
			return branches[i];
204 205
	}

D
Daniel Barkalow 已提交
206 207 208
	ALLOC_GROW(branches, branches_nr + 1, branches_alloc);
	ret = xcalloc(1, sizeof(struct branch));
	branches[branches_nr++] = ret;
209
	if (len)
D
Daniel Barkalow 已提交
210
		ret->name = xstrndup(name, len);
211
	else
D
Daniel Barkalow 已提交
212
		ret->name = xstrdup(name);
213
	ret->refname = xstrfmt("refs/heads/%s", ret->name);
214

D
Daniel Barkalow 已提交
215
	return ret;
216 217
}

218
static struct rewrite *make_rewrite(struct rewrites *r, const char *base, int len)
219 220 221 222
{
	struct rewrite *ret;
	int i;

223
	for (i = 0; i < r->rewrite_nr; i++) {
224
		if (len
225 226 227 228
		    ? (len == r->rewrite[i]->baselen &&
		       !strncmp(base, r->rewrite[i]->base, len))
		    : !strcmp(base, r->rewrite[i]->base))
			return r->rewrite[i];
229 230
	}

231
	ALLOC_GROW(r->rewrite, r->rewrite_nr + 1, r->rewrite_alloc);
232
	ret = xcalloc(1, sizeof(struct rewrite));
233
	r->rewrite[r->rewrite_nr++] = ret;
234
	if (len) {
235
		ret->base = xstrndup(base, len);
236 237 238
		ret->baselen = len;
	}
	else {
239
		ret->base = xstrdup(base);
240 241
		ret->baselen = strlen(base);
	}
242 243 244 245 246 247
	return ret;
}

static void add_instead_of(struct rewrite *rewrite, const char *instead_of)
{
	ALLOC_GROW(rewrite->instead_of, rewrite->instead_of_nr + 1, rewrite->instead_of_alloc);
248 249 250
	rewrite->instead_of[rewrite->instead_of_nr].s = instead_of;
	rewrite->instead_of[rewrite->instead_of_nr].len = strlen(instead_of);
	rewrite->instead_of_nr++;
251 252
}

253 254 255 256 257 258 259
static const char *skip_spaces(const char *s)
{
	while (isspace(*s))
		s++;
	return s;
}

260 261
static void read_remotes_file(struct remote *remote)
{
262
	struct strbuf buf = STRBUF_INIT;
263
	FILE *f = fopen_or_warn(git_path("remotes/%s", remote->name), "r");
264 265 266

	if (!f)
		return;
267
	remote->configured_in_repo = 1;
268
	remote->origin = REMOTE_REMOTES;
269
	while (strbuf_getline(&buf, f) != EOF) {
270
		const char *v;
271

272
		strbuf_rtrim(&buf);
273

274 275 276 277 278 279
		if (skip_prefix(buf.buf, "URL:", &v))
			add_url_alias(remote, xstrdup(skip_spaces(v)));
		else if (skip_prefix(buf.buf, "Push:", &v))
			add_push_refspec(remote, xstrdup(skip_spaces(v)));
		else if (skip_prefix(buf.buf, "Pull:", &v))
			add_fetch_refspec(remote, xstrdup(skip_spaces(v)));
280
	}
281
	strbuf_release(&buf);
282 283 284 285 286
	fclose(f);
}

static void read_branches_file(struct remote *remote)
{
287
	char *frag;
288
	struct strbuf buf = STRBUF_INIT;
289
	FILE *f = fopen_or_warn(git_path("branches/%s", remote->name), "r");
290 291 292

	if (!f)
		return;
293

294
	strbuf_getline_lf(&buf, f);
295
	fclose(f);
296 297 298
	strbuf_trim(&buf);
	if (!buf.len) {
		strbuf_release(&buf);
299
		return;
300 301
	}

302
	remote->configured_in_repo = 1;
303
	remote->origin = REMOTE_BRANCHES;
304 305

	/*
306
	 * The branches file would have URL and optionally
307
	 * #branch specified.  The "master" (or specified) branch is
308 309
	 * fetched and stored in the local branch matching the
	 * remote name.
310
	 */
311 312
	frag = strchr(buf.buf, '#');
	if (frag)
313
		*(frag++) = '\0';
314 315 316 317 318 319
	else
		frag = "master";

	add_url_alias(remote, strbuf_detach(&buf, NULL));
	add_fetch_refspec(remote, xstrfmt("refs/heads/%s:refs/heads/%s",
					  frag, remote->name));
320

321 322 323 324
	/*
	 * Cogito compatible push: push current HEAD to remote #branch
	 * (master if missing)
	 */
325
	add_push_refspec(remote, xstrfmt("HEAD:refs/heads/%s", frag));
326
	remote->fetch_tags = 1; /* always auto-follow */
327 328
}

329
static int handle_config(const char *key, const char *value, void *cb)
330 331
{
	const char *name;
T
Thomas Gummerer 已提交
332
	int namelen;
333 334
	const char *subkey;
	struct remote *remote;
335
	struct branch *branch;
T
Thomas Gummerer 已提交
336 337
	if (parse_config_key(key, "branch", &name, &namelen, &subkey) >= 0) {
		if (!name)
338
			return 0;
T
Thomas Gummerer 已提交
339 340
		branch = make_branch(name, namelen);
		if (!strcmp(subkey, "remote")) {
341
			return git_config_string(&branch->remote_name, key, value);
T
Thomas Gummerer 已提交
342
		} else if (!strcmp(subkey, "pushremote")) {
343
			return git_config_string(&branch->pushremote_name, key, value);
T
Thomas Gummerer 已提交
344
		} else if (!strcmp(subkey, "merge")) {
345 346
			if (!value)
				return config_error_nonbool(key);
347
			add_merge(branch, xstrdup(value));
348
		}
349
		return 0;
350
	}
T
Thomas Gummerer 已提交
351
	if (parse_config_key(key, "url", &name, &namelen, &subkey) >= 0) {
352
		struct rewrite *rewrite;
T
Thomas Gummerer 已提交
353
		if (!name)
354
			return 0;
T
Thomas Gummerer 已提交
355 356
		if (!strcmp(subkey, "insteadof")) {
			rewrite = make_rewrite(&rewrites, name, namelen);
357 358 359
			if (!value)
				return config_error_nonbool(key);
			add_instead_of(rewrite, xstrdup(value));
T
Thomas Gummerer 已提交
360 361
		} else if (!strcmp(subkey, "pushinsteadof")) {
			rewrite = make_rewrite(&rewrites_push, name, namelen);
362 363 364 365 366
			if (!value)
				return config_error_nonbool(key);
			add_instead_of(rewrite, xstrdup(value));
		}
	}
367

T
Thomas Gummerer 已提交
368
	if (parse_config_key(key, "remote", &name, &namelen, &subkey) < 0)
369
		return 0;
370 371

	/* Handle remote.* variables */
T
Thomas Gummerer 已提交
372
	if (!name && !strcmp(subkey, "pushdefault"))
373 374
		return git_config_string(&pushremote_name, key, value);

T
Thomas Gummerer 已提交
375 376
	if (!name)
		return 0;
377
	/* Handle remote.<name>.* variables */
378 379 380 381 382
	if (*name == '/') {
		warning("Config remote shorthand cannot begin with '/': %s",
			name);
		return 0;
	}
T
Thomas Gummerer 已提交
383
	remote = make_remote(name, namelen);
384
	remote->origin = REMOTE_CONFIG;
385 386
	if (current_config_scope() == CONFIG_SCOPE_REPO)
		remote->configured_in_repo = 1;
T
Thomas Gummerer 已提交
387
	if (!strcmp(subkey, "mirror"))
388
		remote->mirror = git_config_bool(key, value);
T
Thomas Gummerer 已提交
389
	else if (!strcmp(subkey, "skipdefaultupdate"))
390
		remote->skip_default_update = git_config_bool(key, value);
T
Thomas Gummerer 已提交
391
	else if (!strcmp(subkey, "skipfetchall"))
392
		remote->skip_default_update = git_config_bool(key, value);
T
Thomas Gummerer 已提交
393
	else if (!strcmp(subkey, "prune"))
394
		remote->prune = git_config_bool(key, value);
T
Thomas Gummerer 已提交
395
	else if (!strcmp(subkey, "url")) {
396 397 398 399
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
		add_url(remote, v);
T
Thomas Gummerer 已提交
400
	} else if (!strcmp(subkey, "pushurl")) {
401 402 403 404
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
		add_pushurl(remote, v);
T
Thomas Gummerer 已提交
405
	} else if (!strcmp(subkey, "push")) {
406 407 408 409
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
		add_push_refspec(remote, v);
T
Thomas Gummerer 已提交
410
	} else if (!strcmp(subkey, "fetch")) {
411 412 413 414
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
		add_fetch_refspec(remote, v);
T
Thomas Gummerer 已提交
415
	} else if (!strcmp(subkey, "receivepack")) {
416 417 418
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
419
		if (!remote->receivepack)
420
			remote->receivepack = v;
421 422
		else
			error("more than one receivepack given, using the first");
T
Thomas Gummerer 已提交
423
	} else if (!strcmp(subkey, "uploadpack")) {
424 425 426
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
427
		if (!remote->uploadpack)
428
			remote->uploadpack = v;
429 430
		else
			error("more than one uploadpack given, using the first");
T
Thomas Gummerer 已提交
431
	} else if (!strcmp(subkey, "tagopt")) {
432 433
		if (!strcmp(value, "--no-tags"))
			remote->fetch_tags = -1;
434 435
		else if (!strcmp(value, "--tags"))
			remote->fetch_tags = 2;
T
Thomas Gummerer 已提交
436
	} else if (!strcmp(subkey, "proxy")) {
437 438
		return git_config_string((const char **)&remote->http_proxy,
					 key, value);
T
Thomas Gummerer 已提交
439
	} else if (!strcmp(subkey, "proxyauthmethod")) {
440 441
		return git_config_string((const char **)&remote->http_proxy_authmethod,
					 key, value);
T
Thomas Gummerer 已提交
442
	} else if (!strcmp(subkey, "vcs")) {
443
		return git_config_string(&remote->foreign_vcs, key, value);
444
	}
445 446 447
	return 0;
}

448 449 450 451
static void alias_all_urls(void)
{
	int i, j;
	for (i = 0; i < remotes_nr; i++) {
452
		int add_pushurl_aliases;
453 454
		if (!remotes[i])
			continue;
455
		for (j = 0; j < remotes[i]->pushurl_nr; j++) {
456
			remotes[i]->pushurl[j] = alias_url(remotes[i]->pushurl[j], &rewrites);
457
		}
458 459 460 461 462 463
		add_pushurl_aliases = remotes[i]->pushurl_nr == 0;
		for (j = 0; j < remotes[i]->url_nr; j++) {
			if (add_pushurl_aliases)
				add_pushurl_alias(remotes[i], remotes[i]->url[j]);
			remotes[i]->url[j] = alias_url(remotes[i]->url[j], &rewrites);
		}
464 465 466
	}
}

467 468
static void read_config(void)
{
469
	static int loaded;
470
	int flag;
471 472

	if (loaded)
473
		return;
474 475
	loaded = 1;

476
	current_branch = NULL;
477
	if (startup_info->have_repository) {
478
		const char *head_ref = resolve_ref_unsafe("HEAD", 0, NULL, &flag);
479 480 481 482
		if (head_ref && (flag & REF_ISSYMREF) &&
		    skip_prefix(head_ref, "refs/heads/", &head_ref)) {
			current_branch = make_branch(head_ref, 0);
		}
483
	}
484
	git_config(handle_config, NULL);
485
	alias_all_urls();
486 487
}

488
static struct refspec *parse_refspec_internal(int nr_refspec, const char **refspec, int fetch, int verify)
489 490
{
	int i;
491
	struct refspec *rs = xcalloc(nr_refspec, sizeof(*rs));
492

493
	for (i = 0; i < nr_refspec; i++) {
494
		size_t llen;
495 496
		int is_glob;
		const char *lhs, *rhs;
497
		int flags;
498

B
Benjamin Kramer 已提交
499
		is_glob = 0;
500 501 502

		lhs = refspec[i];
		if (*lhs == '+') {
503
			rs[i].force = 1;
504
			lhs++;
505
		}
506 507

		rhs = strrchr(lhs, ':');
508 509 510

		/*
		 * Before going on, special case ":" (or "+:") as a refspec
511
		 * for pushing matching refs.
512 513 514 515 516 517
		 */
		if (!fetch && rhs == lhs && rhs[1] == '\0') {
			rs[i].matching = 1;
			continue;
		}

518
		if (rhs) {
519
			size_t rlen = strlen(++rhs);
520
			is_glob = (1 <= rlen && strchr(rhs, '*'));
D
Daniel Barkalow 已提交
521
			rs[i].dst = xstrndup(rhs, rlen);
522
		}
D
Daniel Barkalow 已提交
523

524
		llen = (rhs ? (rhs - lhs - 1) : strlen(lhs));
525
		if (1 <= llen && memchr(lhs, '*', llen)) {
526 527 528 529 530
			if ((rhs && !is_glob) || (!rhs && fetch))
				goto invalid;
			is_glob = 1;
		} else if (rhs && is_glob) {
			goto invalid;
D
Daniel Barkalow 已提交
531
		}
532

533 534
		rs[i].pattern = is_glob;
		rs[i].src = xstrndup(lhs, llen);
535
		flags = REFNAME_ALLOW_ONELEVEL | (is_glob ? REFNAME_REFSPEC_PATTERN : 0);
536 537

		if (fetch) {
538
			struct object_id unused;
539

540
			/* LHS */
541
			if (!*rs[i].src)
542
				; /* empty is ok; it means "HEAD" */
543
			else if (llen == GIT_SHA1_HEXSZ && !get_oid_hex(rs[i].src, &unused))
544
				rs[i].exact_sha1 = 1; /* ok */
545 546 547
			else if (!check_refname_format(rs[i].src, flags))
				; /* valid looking ref is ok */
			else
548
				goto invalid;
549
			/* RHS */
550
			if (!rs[i].dst)
551
				; /* missing is ok; it is the same as empty */
552
			else if (!*rs[i].dst)
553 554 555 556
				; /* empty is ok; it means "do not store" */
			else if (!check_refname_format(rs[i].dst, flags))
				; /* valid looking ref is ok */
			else
557
				goto invalid;
558 559 560 561 562 563 564 565 566 567 568
		} else {
			/*
			 * LHS
			 * - empty is allowed; it means delete.
			 * - when wildcarded, it must be a valid looking ref.
			 * - otherwise, it must be an extended SHA-1, but
			 *   there is no existing way to validate this.
			 */
			if (!*rs[i].src)
				; /* empty is ok */
			else if (is_glob) {
569
				if (check_refname_format(rs[i].src, flags))
570 571 572 573 574 575 576 577 578 579 580 581
					goto invalid;
			}
			else
				; /* anything goes, for now */
			/*
			 * RHS
			 * - missing is allowed, but LHS then must be a
			 *   valid looking ref.
			 * - empty is not allowed.
			 * - otherwise it must be a valid looking ref.
			 */
			if (!rs[i].dst) {
582
				if (check_refname_format(rs[i].src, flags))
583 584 585 586
					goto invalid;
			} else if (!*rs[i].dst) {
				goto invalid;
			} else {
587
				if (check_refname_format(rs[i].dst, flags))
588 589
					goto invalid;
			}
D
Daniel Barkalow 已提交
590
		}
591 592
	}
	return rs;
593 594

 invalid:
595
	if (verify) {
596 597 598 599 600
		/*
		 * nr_refspec must be greater than zero and i must be valid
		 * since it is only possible to reach this point from within
		 * the for loop above.
		 */
601
		free_refspec(i+1, rs);
602 603
		return NULL;
	}
604 605 606
	die("Invalid refspec '%s'", refspec[i]);
}

607 608 609 610
int valid_fetch_refspec(const char *fetch_refspec_str)
{
	struct refspec *refspec;

611
	refspec = parse_refspec_internal(1, &fetch_refspec_str, 1, 1);
612
	free_refspec(1, refspec);
613 614 615
	return !!refspec;
}

616 617
struct refspec *parse_fetch_refspec(int nr_refspec, const char **refspec)
{
618
	return parse_refspec_internal(nr_refspec, refspec, 1, 0);
619 620
}

621
struct refspec *parse_push_refspec(int nr_refspec, const char **refspec)
622
{
623
	return parse_refspec_internal(nr_refspec, refspec, 0, 0);
624 625
}

626 627 628
void free_refspec(int nr_refspec, struct refspec *refspec)
{
	int i;
629 630 631 632

	if (!refspec)
		return;

633 634 635 636 637 638 639
	for (i = 0; i < nr_refspec; i++) {
		free(refspec[i].src);
		free(refspec[i].dst);
	}
	free(refspec);
}

640 641
static int valid_remote_nick(const char *name)
{
642
	if (!name[0] || is_dot_or_dotdot(name))
643
		return 0;
644 645 646 647 648 649

	/* remote nicknames cannot contain slashes */
	while (*name)
		if (is_dir_sep(*name++))
			return 0;
	return 1;
650 651
}

652 653 654 655 656 657 658 659 660 661 662 663
const char *remote_for_branch(struct branch *branch, int *explicit)
{
	if (branch && branch->remote_name) {
		if (explicit)
			*explicit = 1;
		return branch->remote_name;
	}
	if (explicit)
		*explicit = 0;
	return "origin";
}

664 665 666 667 668 669 670 671 672 673 674 675 676 677 678
const char *pushremote_for_branch(struct branch *branch, int *explicit)
{
	if (branch && branch->pushremote_name) {
		if (explicit)
			*explicit = 1;
		return branch->pushremote_name;
	}
	if (pushremote_name) {
		if (explicit)
			*explicit = 1;
		return pushremote_name;
	}
	return remote_for_branch(branch, explicit);
}

679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708
const char *remote_ref_for_branch(struct branch *branch, int for_push,
				  int *explicit)
{
	if (branch) {
		if (!for_push) {
			if (branch->merge_nr) {
				if (explicit)
					*explicit = 1;
				return branch->merge_name[0];
			}
		} else {
			const char *dst, *remote_name =
				pushremote_for_branch(branch, NULL);
			struct remote *remote = remote_get(remote_name);

			if (remote && remote->push_refspec_nr &&
			    (dst = apply_refspecs(remote->push,
						  remote->push_refspec_nr,
						  branch->refname))) {
				if (explicit)
					*explicit = 1;
				return dst;
			}
		}
	}
	if (explicit)
		*explicit = 0;
	return "";
}

709 710
static struct remote *remote_get_1(const char *name,
				   const char *(*get_default)(struct branch *, int *))
711 712
{
	struct remote *ret;
713
	int name_given = 0;
714

715 716
	read_config();

717 718
	if (name)
		name_given = 1;
719 720
	else
		name = get_default(current_branch, &name_given);
721

722
	ret = make_remote(name, 0);
723
	if (valid_remote_nick(name) && have_git_dir()) {
724
		if (!valid_remote(ret))
725
			read_remotes_file(ret);
726
		if (!valid_remote(ret))
727 728
			read_branches_file(ret);
	}
729
	if (name_given && !valid_remote(ret))
730
		add_url_alias(ret, name);
731
	if (!valid_remote(ret))
732
		return NULL;
733 734
	ret->fetch = parse_fetch_refspec(ret->fetch_refspec_nr, ret->fetch_refspec);
	ret->push = parse_push_refspec(ret->push_refspec_nr, ret->push_refspec);
735 736
	return ret;
}
737

738 739
struct remote *remote_get(const char *name)
{
740
	return remote_get_1(name, remote_for_branch);
741 742 743 744
}

struct remote *pushremote_get(const char *name)
{
745
	return remote_get_1(name, pushremote_for_branch);
746 747
}

748
int remote_is_configured(struct remote *remote, int in_repo)
749
{
750 751 752 753 754
	if (!remote)
		return 0;
	if (in_repo)
		return remote->configured_in_repo;
	return !!remote->origin;
755 756
}

757 758 759 760
int for_each_remote(each_remote_fn fn, void *priv)
{
	int i, result = 0;
	read_config();
D
Daniel Barkalow 已提交
761
	for (i = 0; i < remotes_nr && !result; i++) {
762 763 764 765
		struct remote *r = remotes[i];
		if (!r)
			continue;
		if (!r->fetch)
766 767
			r->fetch = parse_fetch_refspec(r->fetch_refspec_nr,
						       r->fetch_refspec);
768
		if (!r->push)
769 770
			r->push = parse_push_refspec(r->push_refspec_nr,
						     r->push_refspec);
771 772 773 774 775
		result = fn(r, priv);
	}
	return result;
}

776 777
static void handle_duplicate(struct ref *ref1, struct ref *ref2)
{
778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799
	if (strcmp(ref1->name, ref2->name)) {
		if (ref1->fetch_head_status != FETCH_HEAD_IGNORE &&
		    ref2->fetch_head_status != FETCH_HEAD_IGNORE) {
			die(_("Cannot fetch both %s and %s to %s"),
			    ref1->name, ref2->name, ref2->peer_ref->name);
		} else if (ref1->fetch_head_status != FETCH_HEAD_IGNORE &&
			   ref2->fetch_head_status == FETCH_HEAD_IGNORE) {
			warning(_("%s usually tracks %s, not %s"),
				ref2->peer_ref->name, ref2->name, ref1->name);
		} else if (ref1->fetch_head_status == FETCH_HEAD_IGNORE &&
			   ref2->fetch_head_status == FETCH_HEAD_IGNORE) {
			die(_("%s tracks both %s and %s"),
			    ref2->peer_ref->name, ref1->name, ref2->name);
		} else {
			/*
			 * This last possibility doesn't occur because
			 * FETCH_HEAD_IGNORE entries always appear at
			 * the end of the list.
			 */
			die(_("Internal error"));
		}
	}
800 801 802 803
	free(ref2->peer_ref);
	free(ref2);
}

804
struct ref *ref_remove_duplicates(struct ref *ref_map)
805
{
806
	struct string_list refs = STRING_LIST_INIT_NODUP;
807 808
	struct ref *retval = NULL;
	struct ref **p = &retval;
809

810 811 812 813 814
	while (ref_map) {
		struct ref *ref = ref_map;

		ref_map = ref_map->next;
		ref->next = NULL;
815

816 817 818
		if (!ref->peer_ref) {
			*p = ref;
			p = &ref->next;
819
		} else {
820 821 822 823 824
			struct string_list_item *item =
				string_list_insert(&refs, ref->peer_ref->name);

			if (item->util) {
				/* Entry already existed */
825
				handle_duplicate((struct ref *)item->util, ref);
826 827 828 829 830
			} else {
				*p = ref;
				p = &ref->next;
				item->util = ref;
			}
831 832
		}
	}
833

834
	string_list_clear(&refs, 0);
835
	return retval;
836 837
}

838
int remote_has_url(struct remote *remote, const char *url)
839 840
{
	int i;
841 842
	for (i = 0; i < remote->url_nr; i++) {
		if (!strcmp(remote->url[i], url))
843 844 845 846 847
			return 1;
	}
	return 0;
}

848 849
static int match_name_with_pattern(const char *key, const char *name,
				   const char *value, char **result)
850
{
D
Daniel Barkalow 已提交
851 852
	const char *kstar = strchr(key, '*');
	size_t klen;
853 854
	size_t ksuffixlen;
	size_t namelen;
D
Daniel Barkalow 已提交
855 856 857 858
	int ret;
	if (!kstar)
		die("Key '%s' of pattern had no '*'", key);
	klen = kstar - key;
859 860 861 862
	ksuffixlen = strlen(kstar + 1);
	namelen = strlen(name);
	ret = !strncmp(name, key, klen) && namelen >= klen + ksuffixlen &&
		!memcmp(name + namelen - ksuffixlen, kstar + 1, ksuffixlen);
863
	if (ret && value) {
864
		struct strbuf sb = STRBUF_INIT;
D
Daniel Barkalow 已提交
865 866 867
		const char *vstar = strchr(value, '*');
		if (!vstar)
			die("Value '%s' of pattern has no '*'", value);
868 869 870 871
		strbuf_add(&sb, value, vstar - value);
		strbuf_add(&sb, name + klen, namelen - klen - ksuffixlen);
		strbuf_addstr(&sb, vstar + 1);
		*result = strbuf_detach(&sb, NULL);
872
	}
873 874 875
	return ret;
}

876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901
static void query_refspecs_multiple(struct refspec *refs, int ref_count, struct refspec *query, struct string_list *results)
{
	int i;
	int find_src = !query->src;

	if (find_src && !query->dst)
		error("query_refspecs_multiple: need either src or dst");

	for (i = 0; i < ref_count; i++) {
		struct refspec *refspec = &refs[i];
		const char *key = find_src ? refspec->dst : refspec->src;
		const char *value = find_src ? refspec->src : refspec->dst;
		const char *needle = find_src ? query->dst : query->src;
		char **result = find_src ? &query->src : &query->dst;

		if (!refspec->dst)
			continue;
		if (refspec->pattern) {
			if (match_name_with_pattern(key, needle, value, result))
				string_list_append_nodup(results, *result);
		} else if (!strcmp(needle, key)) {
			string_list_append(results, value);
		}
	}
}

902
int query_refspecs(struct refspec *refs, int ref_count, struct refspec *query)
903 904
{
	int i;
905
	int find_src = !query->src;
906 907
	const char *needle = find_src ? query->dst : query->src;
	char **result = find_src ? &query->src : &query->dst;
908

909 910
	if (find_src && !query->dst)
		return error("query_refspecs: need either src or dst");
911

912 913 914 915
	for (i = 0; i < ref_count; i++) {
		struct refspec *refspec = &refs[i];
		const char *key = find_src ? refspec->dst : refspec->src;
		const char *value = find_src ? refspec->src : refspec->dst;
916

917
		if (!refspec->dst)
918
			continue;
919
		if (refspec->pattern) {
920
			if (match_name_with_pattern(key, needle, value, result)) {
921
				query->force = refspec->force;
922 923
				return 0;
			}
924 925
		} else if (!strcmp(needle, key)) {
			*result = xstrdup(value);
926
			query->force = refspec->force;
927
			return 0;
928 929 930 931 932
		}
	}
	return -1;
}

933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951
char *apply_refspecs(struct refspec *refspecs, int nr_refspec,
		     const char *name)
{
	struct refspec query;

	memset(&query, 0, sizeof(struct refspec));
	query.src = (char *)name;

	if (query_refspecs(refspecs, nr_refspec, &query))
		return NULL;

	return query.dst;
}

int remote_find_tracking(struct remote *remote, struct refspec *refspec)
{
	return query_refspecs(remote->fetch, remote->fetch_refspec_nr, refspec);
}

R
René Scharfe 已提交
952 953 954 955
static struct ref *alloc_ref_with_prefix(const char *prefix, size_t prefixlen,
		const char *name)
{
	size_t len = strlen(name);
956
	struct ref *ref = xcalloc(1, st_add4(sizeof(*ref), prefixlen, len, 1));
R
René Scharfe 已提交
957 958 959 960 961
	memcpy(ref->name, prefix, prefixlen);
	memcpy(ref->name + prefixlen, name, len);
	return ref;
}

962
struct ref *alloc_ref(const char *name)
963
{
964
	return alloc_ref_with_prefix("", 0, name);
965 966
}

J
Jeff King 已提交
967
struct ref *copy_ref(const struct ref *ref)
968
{
969 970 971 972
	struct ref *cpy;
	size_t len;
	if (!ref)
		return NULL;
973 974 975
	len = st_add3(sizeof(struct ref), strlen(ref->name), 1);
	cpy = xmalloc(len);
	memcpy(cpy, ref, len);
976
	cpy->next = NULL;
977 978
	cpy->symref = xstrdup_or_null(ref->symref);
	cpy->remote_status = xstrdup_or_null(ref->remote_status);
979 980
	cpy->peer_ref = copy_ref(ref->peer_ref);
	return cpy;
981 982
}

983 984 985 986 987 988 989 990 991 992 993 994
struct ref *copy_ref_list(const struct ref *ref)
{
	struct ref *ret = NULL;
	struct ref **tail = &ret;
	while (ref) {
		*tail = copy_ref(ref);
		ref = ref->next;
		tail = &((*tail)->next);
	}
	return ret;
}

995
static void free_ref(struct ref *ref)
996 997 998
{
	if (!ref)
		return;
999
	free_ref(ref->peer_ref);
1000 1001 1002 1003 1004
	free(ref->remote_status);
	free(ref->symref);
	free(ref);
}

1005 1006 1007 1008 1009
void free_refs(struct ref *ref)
{
	struct ref *next;
	while (ref) {
		next = ref->next;
1010
		free_ref(ref);
1011 1012 1013 1014
		ref = next;
	}
}

1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035
int ref_compare_name(const void *va, const void *vb)
{
	const struct ref *a = va, *b = vb;
	return strcmp(a->name, b->name);
}

static void *ref_list_get_next(const void *a)
{
	return ((const struct ref *)a)->next;
}

static void ref_list_set_next(void *a, void *next)
{
	((struct ref *)a)->next = next;
}

void sort_ref_list(struct ref **l, int (*cmp)(const void *, const void *))
{
	*l = llist_mergesort(*l, ref_list_get_next, ref_list_set_next, cmp);
}

1036 1037 1038
int count_refspec_match(const char *pattern,
			struct ref *refs,
			struct ref **matched_ref)
1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049
{
	int patlen = strlen(pattern);
	struct ref *matched_weak = NULL;
	struct ref *matched = NULL;
	int weak_match = 0;
	int match = 0;

	for (weak_match = match = 0; refs; refs = refs->next) {
		char *name = refs->name;
		int namelen = strlen(name);

1050
		if (!refname_match(pattern, name))
1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062
			continue;

		/* A match is "weak" if it is with refs outside
		 * heads or tags, and did not specify the pattern
		 * in full (e.g. "refs/remotes/origin/master") or at
		 * least from the toplevel (e.g. "remotes/origin/master");
		 * otherwise "git push $URL master" would result in
		 * ambiguity between remotes/origin/master and heads/master
		 * at the remote site.
		 */
		if (namelen != patlen &&
		    patlen != namelen - 5 &&
1063 1064
		    !starts_with(name, "refs/heads/") &&
		    !starts_with(name, "refs/tags/")) {
1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080
			/* We want to catch the case where only weak
			 * matches are found and there are multiple
			 * matches, and where more than one strong
			 * matches are found, as ambiguous.  One
			 * strong match with zero or more weak matches
			 * are acceptable as a unique match.
			 */
			matched_weak = refs;
			weak_match++;
		}
		else {
			matched = refs;
			match++;
		}
	}
	if (!matched) {
1081 1082
		if (matched_ref)
			*matched_ref = matched_weak;
1083 1084 1085
		return weak_match;
	}
	else {
1086 1087
		if (matched_ref)
			*matched_ref = matched;
1088 1089 1090 1091
		return match;
	}
}

1092
static void tail_link_ref(struct ref *ref, struct ref ***tail)
1093 1094
{
	**tail = ref;
1095 1096
	while (ref->next)
		ref = ref->next;
1097 1098 1099
	*tail = &ref->next;
}

1100 1101 1102
static struct ref *alloc_delete_ref(void)
{
	struct ref *ref = alloc_ref("(delete)");
1103
	oidclr(&ref->new_oid);
1104 1105 1106
	return ref;
}

1107 1108
static int try_explicit_object_name(const char *name,
				    struct ref **match)
1109
{
1110
	struct object_id oid;
1111

1112 1113 1114 1115 1116 1117
	if (!*name) {
		if (match)
			*match = alloc_delete_ref();
		return 0;
	}

1118
	if (get_oid(name, &oid))
1119 1120 1121 1122
		return -1;

	if (match) {
		*match = alloc_ref(name);
1123
		oidcpy(&(*match)->new_oid, &oid);
1124 1125
	}
	return 0;
1126 1127
}

1128
static struct ref *make_linked_ref(const char *name, struct ref ***tail)
1129
{
1130
	struct ref *ret = alloc_ref(name);
1131 1132
	tail_link_ref(ret, tail);
	return ret;
1133
}
1134

1135 1136 1137 1138
static char *guess_ref(const char *name, struct ref *peer)
{
	struct strbuf buf = STRBUF_INIT;

1139
	const char *r = resolve_ref_unsafe(peer->name, RESOLVE_REF_READING,
1140
					   NULL, NULL);
1141 1142 1143
	if (!r)
		return NULL;

1144
	if (starts_with(r, "refs/heads/"))
1145
		strbuf_addstr(&buf, "refs/heads/");
1146
	else if (starts_with(r, "refs/tags/"))
1147 1148 1149 1150 1151 1152 1153 1154
		strbuf_addstr(&buf, "refs/tags/");
	else
		return NULL;

	strbuf_addstr(&buf, name);
	return strbuf_detach(&buf, NULL);
}

1155 1156 1157 1158 1159 1160 1161
static int match_explicit_lhs(struct ref *src,
			      struct refspec *rs,
			      struct ref **match,
			      int *allocated_match)
{
	switch (count_refspec_match(rs->src, src, match)) {
	case 1:
1162 1163
		if (allocated_match)
			*allocated_match = 0;
1164 1165 1166 1167 1168 1169
		return 0;
	case 0:
		/* The source could be in the get_sha1() format
		 * not a reference name.  :refs/other is a
		 * way to delete 'other' ref at the remote end.
		 */
1170
		if (try_explicit_object_name(rs->src, match) < 0)
1171
			return error("src refspec %s does not match any.", rs->src);
1172 1173
		if (allocated_match)
			*allocated_match = 1;
1174 1175 1176 1177 1178 1179
		return 0;
	default:
		return error("src refspec %s matches more than one.", rs->src);
	}
}

1180 1181
static int match_explicit(struct ref *src, struct ref *dst,
			  struct ref ***dst_tail,
1182
			  struct refspec *rs)
1183
{
1184
	struct ref *matched_src, *matched_dst;
1185
	int allocated_src;
1186

1187
	const char *dst_value = rs->dst;
1188
	char *dst_guess;
1189

1190
	if (rs->pattern || rs->matching)
1191
		return 0;
1192

1193
	matched_src = matched_dst = NULL;
1194 1195
	if (match_explicit_lhs(src, rs, &matched_src, &allocated_src) < 0)
		return -1;
1196

1197
	if (!dst_value) {
1198 1199
		int flag;

1200 1201
		dst_value = resolve_ref_unsafe(matched_src->name,
					       RESOLVE_REF_READING,
1202
					       NULL, &flag);
1203 1204
		if (!dst_value ||
		    ((flag & REF_ISSYMREF) &&
1205
		     !starts_with(dst_value, "refs/heads/")))
1206 1207
			die("%s cannot be resolved to branch.",
			    matched_src->name);
1208
	}
1209

1210 1211 1212 1213
	switch (count_refspec_match(dst_value, dst, &matched_dst)) {
	case 1:
		break;
	case 0:
1214
		if (starts_with(dst_value, "refs/"))
1215
			matched_dst = make_linked_ref(dst_value, dst_tail);
1216
		else if (is_null_oid(&matched_src->new_oid))
1217 1218
			error("unable to delete '%s': remote ref does not exist",
			      dst_value);
1219
		else if ((dst_guess = guess_ref(dst_value, matched_src))) {
1220
			matched_dst = make_linked_ref(dst_guess, dst_tail);
1221 1222
			free(dst_guess);
		} else
1223 1224 1225 1226 1227 1228
			error("unable to push to unqualified destination: %s\n"
			      "The destination refspec neither matches an "
			      "existing ref on the remote nor\n"
			      "begins with refs/, and we are unable to "
			      "guess a prefix based on the source ref.",
			      dst_value);
1229 1230
		break;
	default:
1231
		matched_dst = NULL;
1232 1233 1234 1235
		error("dst refspec %s matches more than one.",
		      dst_value);
		break;
	}
1236 1237 1238 1239
	if (!matched_dst)
		return -1;
	if (matched_dst->peer_ref)
		return error("dst ref %s receives from more than one src.",
1240 1241
		      matched_dst->name);
	else {
1242 1243 1244
		matched_dst->peer_ref = allocated_src ?
					matched_src :
					copy_ref(matched_src);
1245
		matched_dst->force = rs->force;
1246
	}
1247
	return 0;
1248 1249 1250 1251 1252 1253 1254 1255
}

static int match_explicit_refs(struct ref *src, struct ref *dst,
			       struct ref ***dst_tail, struct refspec *rs,
			       int rs_nr)
{
	int i, errs;
	for (i = errs = 0; i < rs_nr; i++)
1256 1257
		errs += match_explicit(src, dst, dst_tail, &rs[i]);
	return errs;
1258 1259
}

1260
static char *get_ref_match(const struct refspec *rs, int rs_nr, const struct ref *ref,
F
Felipe Contreras 已提交
1261
		int send_mirror, int direction, const struct refspec **ret_pat)
1262
{
1263 1264
	const struct refspec *pat;
	char *name;
1265
	int i;
1266
	int matching_refs = -1;
1267
	for (i = 0; i < rs_nr; i++) {
1268 1269 1270 1271 1272 1273
		if (rs[i].matching &&
		    (matching_refs == -1 || rs[i].force)) {
			matching_refs = i;
			continue;
		}

1274 1275
		if (rs[i].pattern) {
			const char *dst_side = rs[i].dst ? rs[i].dst : rs[i].src;
F
Felipe Contreras 已提交
1276 1277 1278 1279 1280 1281
			int match;
			if (direction == FROM_SRC)
				match = match_name_with_pattern(rs[i].src, ref->name, dst_side, &name);
			else
				match = match_name_with_pattern(dst_side, ref->name, rs[i].src, &name);
			if (match) {
1282 1283 1284 1285
				matching_refs = i;
				break;
			}
		}
1286
	}
1287
	if (matching_refs == -1)
1288
		return NULL;
1289 1290 1291 1292 1293 1294 1295 1296

	pat = rs + matching_refs;
	if (pat->matching) {
		/*
		 * "matching refs"; traditionally we pushed everything
		 * including refs outside refs/heads/ hierarchy, but
		 * that does not make much sense these days.
		 */
1297
		if (!send_mirror && !starts_with(ref->name, "refs/heads/"))
1298 1299 1300 1301 1302 1303
			return NULL;
		name = xstrdup(ref->name);
	}
	if (ret_pat)
		*ret_pat = pat;
	return name;
1304 1305
}

1306 1307 1308 1309 1310 1311 1312 1313
static struct ref **tail_ref(struct ref **head)
{
	struct ref **tail = head;
	while (*tail)
		tail = &((*tail)->next);
	return tail;
}

J
Junio C Hamano 已提交
1314 1315 1316 1317 1318
struct tips {
	struct commit **tip;
	int nr, alloc;
};

1319
static void add_to_tips(struct tips *tips, const struct object_id *oid)
J
Junio C Hamano 已提交
1320 1321 1322
{
	struct commit *commit;

1323
	if (is_null_oid(oid))
J
Junio C Hamano 已提交
1324
		return;
1325
	commit = lookup_commit_reference_gently(oid, 1);
J
Junio C Hamano 已提交
1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347
	if (!commit || (commit->object.flags & TMP_MARK))
		return;
	commit->object.flags |= TMP_MARK;
	ALLOC_GROW(tips->tip, tips->nr + 1, tips->alloc);
	tips->tip[tips->nr++] = commit;
}

static void add_missing_tags(struct ref *src, struct ref **dst, struct ref ***dst_tail)
{
	struct string_list dst_tag = STRING_LIST_INIT_NODUP;
	struct string_list src_tag = STRING_LIST_INIT_NODUP;
	struct string_list_item *item;
	struct ref *ref;
	struct tips sent_tips;

	/*
	 * Collect everything we know they would have at the end of
	 * this push, and collect all tags they have.
	 */
	memset(&sent_tips, 0, sizeof(sent_tips));
	for (ref = *dst; ref; ref = ref->next) {
		if (ref->peer_ref &&
1348
		    !is_null_oid(&ref->peer_ref->new_oid))
1349
			add_to_tips(&sent_tips, &ref->peer_ref->new_oid);
J
Junio C Hamano 已提交
1350
		else
1351
			add_to_tips(&sent_tips, &ref->old_oid);
1352
		if (starts_with(ref->name, "refs/tags/"))
J
Junio C Hamano 已提交
1353 1354 1355 1356
			string_list_append(&dst_tag, ref->name);
	}
	clear_commit_marks_many(sent_tips.nr, sent_tips.tip, TMP_MARK);

1357
	string_list_sort(&dst_tag);
J
Junio C Hamano 已提交
1358 1359 1360

	/* Collect tags they do not have. */
	for (ref = src; ref; ref = ref->next) {
1361
		if (!starts_with(ref->name, "refs/tags/"))
J
Junio C Hamano 已提交
1362 1363 1364
			continue; /* not a tag */
		if (string_list_has_string(&dst_tag, ref->name))
			continue; /* they already have it */
1365
		if (sha1_object_info(ref->new_oid.hash, NULL) != OBJ_TAG)
J
Junio C Hamano 已提交
1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384
			continue; /* be conservative */
		item = string_list_append(&src_tag, ref->name);
		item->util = ref;
	}
	string_list_clear(&dst_tag, 0);

	/*
	 * At this point, src_tag lists tags that are missing from
	 * dst, and sent_tips lists the tips we are pushing or those
	 * that we know they already have. An element in the src_tag
	 * that is an ancestor of any of the sent_tips needs to be
	 * sent to the other side.
	 */
	if (sent_tips.nr) {
		for_each_string_list_item(item, &src_tag) {
			struct ref *ref = item->util;
			struct ref *dst_ref;
			struct commit *commit;

1385
			if (is_null_oid(&ref->new_oid))
J
Junio C Hamano 已提交
1386
				continue;
1387 1388
			commit = lookup_commit_reference_gently(&ref->new_oid,
								1);
J
Junio C Hamano 已提交
1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401
			if (!commit)
				/* not pushing a commit, which is not an error */
				continue;

			/*
			 * Is this tag, which they do not have, reachable from
			 * any of the commits we are sending?
			 */
			if (!in_merge_bases_many(commit, sent_tips.nr, sent_tips.tip))
				continue;

			/* Add it in */
			dst_ref = make_linked_ref(ref->name, dst_tail);
1402
			oidcpy(&dst_ref->new_oid, &ref->new_oid);
J
Junio C Hamano 已提交
1403 1404 1405 1406 1407 1408 1409
			dst_ref->peer_ref = copy_ref(ref);
		}
	}
	string_list_clear(&src_tag, 0);
	free(sent_tips.tip);
}

1410 1411 1412 1413 1414 1415 1416 1417
struct ref *find_ref_by_name(const struct ref *list, const char *name)
{
	for ( ; list; list = list->next)
		if (!strcmp(list->name, name))
			return (struct ref *)list;
	return NULL;
}

1418 1419 1420 1421 1422
static void prepare_ref_index(struct string_list *ref_index, struct ref *ref)
{
	for ( ; ref; ref = ref->next)
		string_list_append_nodup(ref_index, ref->name)->util = ref;

1423
	string_list_sort(ref_index);
1424 1425
}

1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450
/*
 * Given only the set of local refs, sanity-check the set of push
 * refspecs. We can't catch all errors that match_push_refs would,
 * but we can catch some errors early before even talking to the
 * remote side.
 */
int check_push_refs(struct ref *src, int nr_refspec, const char **refspec_names)
{
	struct refspec *refspec = parse_push_refspec(nr_refspec, refspec_names);
	int ret = 0;
	int i;

	for (i = 0; i < nr_refspec; i++) {
		struct refspec *rs = refspec + i;

		if (rs->pattern || rs->matching)
			continue;

		ret |= match_explicit_lhs(src, rs, NULL, NULL);
	}

	free_refspec(nr_refspec, refspec);
	return ret;
}

1451
/*
1452 1453 1454 1455 1456 1457
 * Given the set of refs the local repository has, the set of refs the
 * remote repository has, and the refspec used for push, determine
 * what remote refs we will update and with what value by setting
 * peer_ref (which object is being pushed) and force (if the push is
 * forced) in elements of "dst". The function may add new elements to
 * dst (e.g. pushing to a new branch, done in match_explicit_refs).
1458
 */
1459 1460
int match_push_refs(struct ref *src, struct ref **dst,
		    int nr_refspec, const char **refspec, int flags)
1461
{
1462
	struct refspec *rs;
A
Andy Whitcroft 已提交
1463 1464
	int send_all = flags & MATCH_REFS_ALL;
	int send_mirror = flags & MATCH_REFS_MIRROR;
F
Felipe Contreras 已提交
1465
	int send_prune = flags & MATCH_REFS_PRUNE;
1466
	int errs;
1467
	static const char *default_refspec[] = { ":", NULL };
1468
	struct ref *ref, **dst_tail = tail_ref(dst);
1469
	struct string_list dst_ref_index = STRING_LIST_INIT_NODUP;
1470

1471 1472 1473 1474 1475
	if (!nr_refspec) {
		nr_refspec = 1;
		refspec = default_refspec;
	}
	rs = parse_push_refspec(nr_refspec, (const char **) refspec);
1476
	errs = match_explicit_refs(src, *dst, &dst_tail, rs, nr_refspec);
1477 1478

	/* pick the remainder */
1479
	for (ref = src; ref; ref = ref->next) {
1480
		struct string_list_item *dst_item;
1481
		struct ref *dst_peer;
1482 1483
		const struct refspec *pat = NULL;
		char *dst_name;
1484

F
Felipe Contreras 已提交
1485
		dst_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_SRC, &pat);
1486
		if (!dst_name)
1487 1488
			continue;

1489 1490 1491 1492 1493
		if (!dst_ref_index.nr)
			prepare_ref_index(&dst_ref_index, *dst);

		dst_item = string_list_lookup(&dst_ref_index, dst_name);
		dst_peer = dst_item ? dst_item->util : NULL;
1494 1495 1496 1497 1498 1499 1500 1501 1502
		if (dst_peer) {
			if (dst_peer->peer_ref)
				/* We're already sending something to this ref. */
				goto free_name;
		} else {
			if (pat->matching && !(send_all || send_mirror))
				/*
				 * Remote doesn't have it, and we have no
				 * explicit pattern, and we don't have
J
Justin Lebar 已提交
1503
				 * --all or --mirror.
1504 1505
				 */
				goto free_name;
A
Andy Whitcroft 已提交
1506

1507
			/* Create a new one and link it */
1508
			dst_peer = make_linked_ref(dst_name, &dst_tail);
1509
			oidcpy(&dst_peer->new_oid, &ref->new_oid);
1510 1511
			string_list_insert(&dst_ref_index,
				dst_peer->name)->util = dst_peer;
1512
		}
1513
		dst_peer->peer_ref = copy_ref(ref);
1514
		dst_peer->force = pat->force;
1515 1516
	free_name:
		free(dst_name);
1517
	}
J
Junio C Hamano 已提交
1518

1519 1520
	string_list_clear(&dst_ref_index, 0);

J
Junio C Hamano 已提交
1521 1522 1523
	if (flags & MATCH_REFS_FOLLOW_TAGS)
		add_missing_tags(src, dst, &dst_tail);

F
Felipe Contreras 已提交
1524
	if (send_prune) {
1525
		struct string_list src_ref_index = STRING_LIST_INIT_NODUP;
F
Felipe Contreras 已提交
1526 1527 1528 1529 1530 1531 1532 1533 1534 1535
		/* check for missing refs on the remote */
		for (ref = *dst; ref; ref = ref->next) {
			char *src_name;

			if (ref->peer_ref)
				/* We're already sending something to this ref. */
				continue;

			src_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_DST, NULL);
			if (src_name) {
1536 1537 1538 1539
				if (!src_ref_index.nr)
					prepare_ref_index(&src_ref_index, src);
				if (!string_list_has_string(&src_ref_index,
					    src_name))
F
Felipe Contreras 已提交
1540 1541 1542 1543
					ref->peer_ref = alloc_delete_ref();
				free(src_name);
			}
		}
1544
		string_list_clear(&src_ref_index, 0);
F
Felipe Contreras 已提交
1545
	}
1546 1547
	if (errs)
		return -1;
1548 1549
	return 0;
}
1550

1551
void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
1552
			     int force_update)
1553 1554 1555 1556
{
	struct ref *ref;

	for (ref = remote_refs; ref; ref = ref->next) {
1557
		int force_ref_update = ref->force || force_update;
1558
		int reject_reason = 0;
1559

1560
		if (ref->peer_ref)
1561
			oidcpy(&ref->new_oid, &ref->peer_ref->new_oid);
1562 1563 1564
		else if (!send_mirror)
			continue;

1565
		ref->deletion = is_null_oid(&ref->new_oid);
1566
		if (!ref->deletion &&
1567
			!oidcmp(&ref->old_oid, &ref->new_oid)) {
1568 1569 1570 1571
			ref->status = REF_STATUS_UPTODATE;
			continue;
		}

C
Chris Rorvick 已提交
1572
		/*
1573 1574
		 * If the remote ref has moved and is now different
		 * from what we expect, reject any push.
1575 1576 1577 1578 1579 1580 1581
		 *
		 * It also is an error if the user told us to check
		 * with the remote-tracking branch to find the value
		 * to expect, but we did not have such a tracking
		 * branch.
		 */
		if (ref->expect_old_sha1) {
1582
			if (oidcmp(&ref->old_oid, &ref->old_oid_expect))
1583
				reject_reason = REF_STATUS_REJECT_STALE;
1584 1585 1586
			else
				/* If the ref isn't stale then force the update. */
				force_ref_update = 1;
1587 1588 1589
		}

		/*
1590 1591
		 * If the update isn't already rejected then check
		 * the usual "must fast-forward" rules.
1592
		 *
1593 1594 1595
		 * Decide whether an individual refspec A:B can be
		 * pushed.  The push will succeed if any of the
		 * following are true:
1596
		 *
C
Chris Rorvick 已提交
1597
		 * (1) the remote reference B does not exist
1598
		 *
C
Chris Rorvick 已提交
1599 1600
		 * (2) the remote reference B is being removed (i.e.,
		 *     pushing :B where no source is specified)
1601
		 *
1602 1603 1604
		 * (3) the destination is not under refs/tags/, and
		 *     if the old and new value is a commit, the new
		 *     is a descendant of the old.
1605
		 *
C
Chris Rorvick 已提交
1606 1607
		 * (4) it is forced using the +A:B notation, or by
		 *     passing the --force argument
1608 1609
		 */

1610
		if (!reject_reason && !ref->deletion && !is_null_oid(&ref->old_oid)) {
1611
			if (starts_with(ref->name, "refs/tags/"))
1612
				reject_reason = REF_STATUS_REJECT_ALREADY_EXISTS;
1613
			else if (!has_object_file(&ref->old_oid))
1614
				reject_reason = REF_STATUS_REJECT_FETCH_FIRST;
1615 1616
			else if (!lookup_commit_reference_gently(&ref->old_oid, 1) ||
				 !lookup_commit_reference_gently(&ref->new_oid, 1))
1617
				reject_reason = REF_STATUS_REJECT_NEEDS_FORCE;
1618
			else if (!ref_newer(&ref->new_oid, &ref->old_oid))
1619
				reject_reason = REF_STATUS_REJECT_NONFASTFORWARD;
1620
		}
1621 1622 1623 1624 1625 1626 1627 1628 1629

		/*
		 * "--force" will defeat any rejection implemented
		 * by the rules above.
		 */
		if (!force_ref_update)
			ref->status = reject_reason;
		else if (reject_reason)
			ref->forced_update = 1;
1630 1631 1632
	}
}

1633 1634
static void set_merge(struct branch *ret)
{
1635
	struct remote *remote;
1636
	char *ref;
1637
	struct object_id oid;
1638 1639
	int i;

1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652
	if (!ret)
		return; /* no branch */
	if (ret->merge)
		return; /* already run */
	if (!ret->remote_name || !ret->merge_nr) {
		/*
		 * no merge config; let's make sure we don't confuse callers
		 * with a non-zero merge_nr but a NULL merge
		 */
		ret->merge_nr = 0;
		return;
	}

1653 1654
	remote = remote_get(ret->remote_name);

1655 1656 1657 1658
	ret->merge = xcalloc(ret->merge_nr, sizeof(*ret->merge));
	for (i = 0; i < ret->merge_nr; i++) {
		ret->merge[i] = xcalloc(1, sizeof(**ret->merge));
		ret->merge[i]->src = xstrdup(ret->merge_name[i]);
1659
		if (!remote_find_tracking(remote, ret->merge[i]) ||
1660 1661 1662
		    strcmp(ret->remote_name, "."))
			continue;
		if (dwim_ref(ret->merge_name[i], strlen(ret->merge_name[i]),
1663
			     &oid, &ref) == 1)
1664 1665 1666 1667 1668 1669
			ret->merge[i]->dst = ref;
		else
			ret->merge[i]->dst = xstrdup(ret->merge_name[i]);
	}
}

1670 1671 1672 1673 1674 1675 1676 1677 1678
struct branch *branch_get(const char *name)
{
	struct branch *ret;

	read_config();
	if (!name || !*name || !strcmp(name, "HEAD"))
		ret = current_branch;
	else
		ret = make_branch(name, 0);
1679
	set_merge(ret);
1680 1681 1682 1683 1684 1685 1686 1687
	return ret;
}

int branch_has_merge_config(struct branch *branch)
{
	return branch && !!branch->merge;
}

1688 1689 1690
int branch_merge_matches(struct branch *branch,
		                 int i,
		                 const char *refname)
1691
{
1692
	if (!branch || i < 0 || i >= branch->merge_nr)
1693
		return 0;
1694
	return refname_match(branch->merge[i]->src, refname);
1695
}
1696

1697
__attribute__((format (printf,2,3)))
1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712
static const char *error_buf(struct strbuf *err, const char *fmt, ...)
{
	if (err) {
		va_list ap;
		va_start(ap, fmt);
		strbuf_vaddf(err, fmt, ap);
		va_end(ap);
	}
	return NULL;
}

const char *branch_get_upstream(struct branch *branch, struct strbuf *err)
{
	if (!branch)
		return error_buf(err, _("HEAD does not point to a branch"));
1713 1714 1715 1716 1717 1718 1719

	if (!branch->merge || !branch->merge[0]) {
		/*
		 * no merge config; is it because the user didn't define any,
		 * or because it is not a real branch, and get_branch
		 * auto-vivified it?
		 */
1720 1721 1722
		if (!ref_exists(branch->refname))
			return error_buf(err, _("no such branch: '%s'"),
					 branch->name);
1723 1724 1725 1726 1727 1728
		return error_buf(err,
				 _("no upstream configured for branch '%s'"),
				 branch->name);
	}

	if (!branch->merge[0]->dst)
1729 1730 1731 1732
		return error_buf(err,
				 _("upstream branch '%s' not stored as a remote-tracking branch"),
				 branch->merge[0]->src);

1733 1734 1735
	return branch->merge[0]->dst;
}

J
Jeff King 已提交
1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812
static const char *tracking_for_push_dest(struct remote *remote,
					  const char *refname,
					  struct strbuf *err)
{
	char *ret;

	ret = apply_refspecs(remote->fetch, remote->fetch_refspec_nr, refname);
	if (!ret)
		return error_buf(err,
				 _("push destination '%s' on remote '%s' has no local tracking branch"),
				 refname, remote->name);
	return ret;
}

static const char *branch_get_push_1(struct branch *branch, struct strbuf *err)
{
	struct remote *remote;

	remote = remote_get(pushremote_for_branch(branch, NULL));
	if (!remote)
		return error_buf(err,
				 _("branch '%s' has no remote for pushing"),
				 branch->name);

	if (remote->push_refspec_nr) {
		char *dst;
		const char *ret;

		dst = apply_refspecs(remote->push, remote->push_refspec_nr,
				     branch->refname);
		if (!dst)
			return error_buf(err,
					 _("push refspecs for '%s' do not include '%s'"),
					 remote->name, branch->name);

		ret = tracking_for_push_dest(remote, dst, err);
		free(dst);
		return ret;
	}

	if (remote->mirror)
		return tracking_for_push_dest(remote, branch->refname, err);

	switch (push_default) {
	case PUSH_DEFAULT_NOTHING:
		return error_buf(err, _("push has no destination (push.default is 'nothing')"));

	case PUSH_DEFAULT_MATCHING:
	case PUSH_DEFAULT_CURRENT:
		return tracking_for_push_dest(remote, branch->refname, err);

	case PUSH_DEFAULT_UPSTREAM:
		return branch_get_upstream(branch, err);

	case PUSH_DEFAULT_UNSPECIFIED:
	case PUSH_DEFAULT_SIMPLE:
		{
			const char *up, *cur;

			up = branch_get_upstream(branch, err);
			if (!up)
				return NULL;
			cur = tracking_for_push_dest(remote, branch->refname, err);
			if (!cur)
				return NULL;
			if (strcmp(cur, up))
				return error_buf(err,
						 _("cannot resolve 'simple' push to a single destination"));
			return cur;
		}
	}

	die("BUG: unhandled push situation");
}

const char *branch_get_push(struct branch *branch, struct strbuf *err)
{
1813 1814 1815
	if (!branch)
		return error_buf(err, _("HEAD does not point to a branch"));

J
Jeff King 已提交
1816 1817 1818 1819 1820
	if (!branch->push_tracking_ref)
		branch->push_tracking_ref = branch_get_push_1(branch, err);
	return branch->push_tracking_ref;
}

1821 1822 1823 1824
static int ignore_symref_update(const char *refname)
{
	int flag;

1825
	if (!resolve_ref_unsafe(refname, 0, NULL, &flag))
1826 1827 1828 1829
		return 0; /* non-existing refs are OK */
	return (flag & REF_ISSYMREF);
}

1830 1831 1832 1833 1834 1835 1836
/*
 * Create and return a list of (struct ref) consisting of copies of
 * each remote_ref that matches refspec.  refspec must be a pattern.
 * Fill in the copies' peer_ref to describe the local tracking refs to
 * which they map.  Omit any references that would map to an existing
 * local symbolic ref.
 */
1837
static struct ref *get_expanded_map(const struct ref *remote_refs,
1838 1839
				    const struct refspec *refspec)
{
1840
	const struct ref *ref;
1841 1842 1843 1844
	struct ref *ret = NULL;
	struct ref **tail = &ret;

	for (ref = remote_refs; ref; ref = ref->next) {
1845 1846
		char *expn_name = NULL;

1847 1848
		if (strchr(ref->name, '^'))
			continue; /* a dereference item */
1849
		if (match_name_with_pattern(refspec->src, ref->name,
1850 1851
					    refspec->dst, &expn_name) &&
		    !ignore_symref_update(expn_name)) {
1852 1853
			struct ref *cpy = copy_ref(ref);

1854
			cpy->peer_ref = alloc_ref(expn_name);
1855 1856 1857 1858 1859
			if (refspec->force)
				cpy->peer_ref->force = 1;
			*tail = cpy;
			tail = &cpy->next;
		}
1860
		free(expn_name);
1861 1862 1863 1864 1865
	}

	return ret;
}

1866
static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
1867
{
1868
	const struct ref *ref;
1869
	for (ref = refs; ref; ref = ref->next) {
1870
		if (refname_match(name, ref->name))
1871 1872 1873 1874 1875
			return ref;
	}
	return NULL;
}

1876
struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
1877
{
1878
	const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
1879 1880

	if (!ref)
1881
		return NULL;
1882 1883 1884 1885 1886 1887

	return copy_ref(ref);
}

static struct ref *get_local_ref(const char *name)
{
1888
	if (!name || name[0] == '\0')
1889 1890
		return NULL;

1891
	if (starts_with(name, "refs/"))
1892
		return alloc_ref(name);
1893

1894 1895 1896
	if (starts_with(name, "heads/") ||
	    starts_with(name, "tags/") ||
	    starts_with(name, "remotes/"))
R
René Scharfe 已提交
1897
		return alloc_ref_with_prefix("refs/", 5, name);
1898

R
René Scharfe 已提交
1899
	return alloc_ref_with_prefix("refs/heads/", 11, name);
1900 1901
}

1902
int get_fetch_map(const struct ref *remote_refs,
1903
		  const struct refspec *refspec,
1904 1905
		  struct ref ***tail,
		  int missing_ok)
1906
{
D
Daniel Barkalow 已提交
1907
	struct ref *ref_map, **rmp;
1908 1909 1910 1911

	if (refspec->pattern) {
		ref_map = get_expanded_map(remote_refs, refspec);
	} else {
1912 1913
		const char *name = refspec->src[0] ? refspec->src : "HEAD";

1914 1915
		if (refspec->exact_sha1) {
			ref_map = alloc_ref(name);
1916
			get_oid_hex(name, &ref_map->old_oid);
1917 1918 1919
		} else {
			ref_map = get_remote_ref(remote_refs, name);
		}
1920 1921 1922 1923 1924 1925 1926
		if (!missing_ok && !ref_map)
			die("Couldn't find remote ref %s", name);
		if (ref_map) {
			ref_map->peer_ref = get_local_ref(refspec->dst);
			if (ref_map->peer_ref && refspec->force)
				ref_map->peer_ref->force = 1;
		}
1927 1928
	}

D
Daniel Barkalow 已提交
1929 1930
	for (rmp = &ref_map; *rmp; ) {
		if ((*rmp)->peer_ref) {
1931
			if (!starts_with((*rmp)->peer_ref->name, "refs/") ||
1932
			    check_refname_format((*rmp)->peer_ref->name, 0)) {
D
Daniel Barkalow 已提交
1933 1934 1935 1936 1937 1938 1939 1940 1941 1942
				struct ref *ignore = *rmp;
				error("* Ignoring funny ref '%s' locally",
				      (*rmp)->peer_ref->name);
				*rmp = (*rmp)->next;
				free(ignore->peer_ref);
				free(ignore);
				continue;
			}
		}
		rmp = &((*rmp)->next);
1943 1944
	}

1945 1946
	if (ref_map)
		tail_link_ref(ref_map, tail);
1947 1948 1949

	return 0;
}
1950 1951 1952 1953 1954 1955 1956

int resolve_remote_symref(struct ref *ref, struct ref *list)
{
	if (!ref->symref)
		return 0;
	for (; list; list = list->next)
		if (!strcmp(ref->symref, list->name)) {
1957
			oidcpy(&ref->old_oid, &list->old_oid);
1958 1959 1960 1961
			return 0;
		}
	return 1;
}
1962

1963 1964 1965
static void unmark_and_free(struct commit_list *list, unsigned int mark)
{
	while (list) {
1966 1967
		struct commit *commit = pop_commit(&list);
		commit->object.flags &= ~mark;
1968 1969 1970
	}
}

1971
int ref_newer(const struct object_id *new_oid, const struct object_id *old_oid)
1972 1973 1974 1975 1976 1977
{
	struct object *o;
	struct commit *old, *new;
	struct commit_list *list, *used;
	int found = 0;

1978 1979
	/*
	 * Both new and old must be commit-ish and new is descendant of
1980 1981
	 * old.  Otherwise we require --force.
	 */
1982
	o = deref_tag(parse_object(old_oid), NULL, 0);
1983 1984 1985 1986
	if (!o || o->type != OBJ_COMMIT)
		return 0;
	old = (struct commit *) o;

1987
	o = deref_tag(parse_object(new_oid), NULL, 0);
1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
	if (!o || o->type != OBJ_COMMIT)
		return 0;
	new = (struct commit *) o;

	if (parse_commit(new) < 0)
		return 0;

	used = list = NULL;
	commit_list_insert(new, &list);
	while (list) {
		new = pop_most_recent_commit(&list, TMP_MARK);
		commit_list_insert(new, &used);
		if (new == old) {
			found = 1;
			break;
		}
	}
	unmark_and_free(list, TMP_MARK);
	unmark_and_free(used, TMP_MARK);
	return found;
}

2010
/*
2011
 * Compare a branch with its upstream, and save their differences (number
2012 2013 2014
 * of commits) in *num_ours and *num_theirs. The name of the upstream branch
 * (or NULL if no upstream is defined) is returned via *upstream_name, if it
 * is not itself NULL.
2015
 *
2016 2017
 * Returns -1 if num_ours and num_theirs could not be filled in (e.g., no
 * upstream defined, or ref does not exist), 0 otherwise.
2018
 */
2019 2020
int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs,
		       const char **upstream_name)
2021
{
2022
	struct object_id oid;
2023 2024
	struct commit *ours, *theirs;
	struct rev_info revs;
2025 2026
	const char *base;
	struct argv_array argv = ARGV_ARRAY_INIT;
2027

2028
	/* Cannot stat unless we are marked to build on top of somebody else. */
2029
	base = branch_get_upstream(branch, NULL);
2030 2031
	if (upstream_name)
		*upstream_name = base;
2032
	if (!base)
2033
		return -1;
2034

2035
	/* Cannot stat if what we used to build on no longer exists */
2036
	if (read_ref(base, &oid))
2037
		return -1;
2038
	theirs = lookup_commit_reference(&oid);
2039
	if (!theirs)
2040
		return -1;
2041

2042
	if (read_ref(branch->refname, &oid))
2043
		return -1;
2044
	ours = lookup_commit_reference(&oid);
2045
	if (!ours)
2046
		return -1;
2047 2048

	/* are we the same? */
2049 2050
	if (theirs == ours) {
		*num_theirs = *num_ours = 0;
2051
		return 0;
2052
	}
2053

2054
	/* Run "rev-list --left-right ours...theirs" internally... */
2055 2056 2057
	argv_array_push(&argv, ""); /* ignored */
	argv_array_push(&argv, "--left-right");
	argv_array_pushf(&argv, "%s...%s",
2058 2059
			 oid_to_hex(&ours->object.oid),
			 oid_to_hex(&theirs->object.oid));
2060
	argv_array_push(&argv, "--");
2061 2062

	init_revisions(&revs, NULL);
2063
	setup_revisions(argv.argc, argv.argv, &revs, NULL);
2064 2065
	if (prepare_revision_walk(&revs))
		die("revision walk setup failed");
2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078

	/* ... and count the commits on each side. */
	*num_ours = 0;
	*num_theirs = 0;
	while (1) {
		struct commit *c = get_revision(&revs);
		if (!c)
			break;
		if (c->object.flags & SYMMETRIC_LEFT)
			(*num_ours)++;
		else
			(*num_theirs)++;
	}
2079 2080 2081 2082

	/* clear object flags smudged by the above traversal */
	clear_commit_marks(ours, ALL_REV_FLAGS);
	clear_commit_marks(theirs, ALL_REV_FLAGS);
2083 2084

	argv_array_clear(&argv);
2085
	return 0;
2086 2087 2088 2089 2090 2091 2092
}

/*
 * Return true when there is anything to report, otherwise false.
 */
int format_tracking_info(struct branch *branch, struct strbuf *sb)
{
2093
	int ours, theirs;
2094
	const char *full_base;
2095
	char *base;
2096
	int upstream_is_gone = 0;
2097

2098 2099 2100
	if (stat_tracking_info(branch, &ours, &theirs, &full_base) < 0) {
		if (!full_base)
			return 0;
2101 2102
		upstream_is_gone = 1;
	}
2103

2104
	base = shorten_unambiguous_ref(full_base, 0);
2105 2106 2107 2108 2109
	if (upstream_is_gone) {
		strbuf_addf(sb,
			_("Your branch is based on '%s', but the upstream is gone.\n"),
			base);
		if (advice_status_hints)
2110
			strbuf_addstr(sb,
2111
				_("  (use \"git branch --unset-upstream\" to fixup)\n"));
2112 2113
	} else if (!ours && !theirs) {
		strbuf_addf(sb,
2114
			_("Your branch is up to date with '%s'.\n"),
2115
			base);
2116
	} else if (!theirs) {
2117 2118 2119
		strbuf_addf(sb,
			Q_("Your branch is ahead of '%s' by %d commit.\n",
			   "Your branch is ahead of '%s' by %d commits.\n",
2120 2121
			   ours),
			base, ours);
2122
		if (advice_status_hints)
2123
			strbuf_addstr(sb,
2124
				_("  (use \"git push\" to publish your local commits)\n"));
2125
	} else if (!ours) {
2126 2127 2128 2129 2130
		strbuf_addf(sb,
			Q_("Your branch is behind '%s' by %d commit, "
			       "and can be fast-forwarded.\n",
			   "Your branch is behind '%s' by %d commits, "
			       "and can be fast-forwarded.\n",
2131 2132
			   theirs),
			base, theirs);
2133
		if (advice_status_hints)
2134
			strbuf_addstr(sb,
2135
				_("  (use \"git pull\" to update your local branch)\n"));
2136
	} else {
2137 2138 2139 2140 2141 2142 2143
		strbuf_addf(sb,
			Q_("Your branch and '%s' have diverged,\n"
			       "and have %d and %d different commit each, "
			       "respectively.\n",
			   "Your branch and '%s' have diverged,\n"
			       "and have %d and %d different commits each, "
			       "respectively.\n",
2144
			   ours + theirs),
2145
			base, ours, theirs);
2146
		if (advice_status_hints)
2147
			strbuf_addstr(sb,
2148
				_("  (use \"git pull\" to merge the remote branch into yours)\n"));
2149
	}
2150
	free(base);
2151 2152
	return 1;
}
2153

2154 2155
static int one_local_ref(const char *refname, const struct object_id *oid,
			 int flag, void *cb_data)
2156 2157 2158 2159 2160
{
	struct ref ***local_tail = cb_data;
	struct ref *ref;

	/* we already know it starts with refs/ to get here */
2161
	if (check_refname_format(refname + 5, 0))
2162 2163
		return 0;

2164
	ref = alloc_ref(refname);
2165
	oidcpy(&ref->new_oid, oid);
2166 2167 2168 2169 2170 2171 2172
	**local_tail = ref;
	*local_tail = &ref->next;
	return 0;
}

struct ref *get_local_heads(void)
{
2173
	struct ref *local_refs = NULL, **local_tail = &local_refs;
2174

2175 2176 2177
	for_each_ref(one_local_ref, &local_tail);
	return local_refs;
}
J
Jay Soffian 已提交
2178

2179 2180 2181
struct ref *guess_remote_head(const struct ref *head,
			      const struct ref *refs,
			      int all)
J
Jay Soffian 已提交
2182 2183
{
	const struct ref *r;
2184 2185
	struct ref *list = NULL;
	struct ref **tail = &list;
J
Jay Soffian 已提交
2186

2187
	if (!head)
J
Jay Soffian 已提交
2188 2189
		return NULL;

2190 2191 2192 2193 2194 2195 2196 2197
	/*
	 * Some transports support directly peeking at
	 * where HEAD points; if that is the case, then
	 * we don't have to guess.
	 */
	if (head->symref)
		return copy_ref(find_ref_by_name(refs, head->symref));

J
Jay Soffian 已提交
2198
	/* If refs/heads/master could be right, it is. */
2199 2200
	if (!all) {
		r = find_ref_by_name(refs, "refs/heads/master");
2201
		if (r && !oidcmp(&r->old_oid, &head->old_oid))
2202 2203
			return copy_ref(r);
	}
J
Jay Soffian 已提交
2204 2205

	/* Look for another ref that points there */
2206
	for (r = refs; r; r = r->next) {
2207
		if (r != head &&
2208
		    starts_with(r->name, "refs/heads/") &&
2209
		    !oidcmp(&r->old_oid, &head->old_oid)) {
2210 2211 2212 2213 2214 2215
			*tail = copy_ref(r);
			tail = &((*tail)->next);
			if (!all)
				break;
		}
	}
J
Jay Soffian 已提交
2216

2217
	return list;
J
Jay Soffian 已提交
2218
}
2219 2220 2221 2222

struct stale_heads_info {
	struct string_list *ref_names;
	struct ref **stale_refs_tail;
2223 2224
	struct refspec *refs;
	int ref_count;
2225 2226
};

2227 2228
static int get_stale_heads_cb(const char *refname, const struct object_id *oid,
			      int flags, void *cb_data)
2229 2230
{
	struct stale_heads_info *info = cb_data;
2231
	struct string_list matches = STRING_LIST_INIT_DUP;
2232
	struct refspec query;
2233
	int i, stale = 1;
2234 2235 2236
	memset(&query, 0, sizeof(struct refspec));
	query.dst = (char *)refname;

2237 2238 2239
	query_refspecs_multiple(info->refs, info->ref_count, &query, &matches);
	if (matches.nr == 0)
		goto clean_exit; /* No matches */
2240 2241 2242 2243

	/*
	 * If we did find a suitable refspec and it's not a symref and
	 * it's not in the list of refs that currently exist in that
2244 2245 2246
	 * remote, we consider it to be stale. In order to deal with
	 * overlapping refspecs, we need to go over all of the
	 * matching refs.
2247
	 */
2248 2249 2250 2251 2252 2253 2254 2255
	if (flags & REF_ISSYMREF)
		goto clean_exit;

	for (i = 0; stale && i < matches.nr; i++)
		if (string_list_has_string(info->ref_names, matches.items[i].string))
			stale = 0;

	if (stale) {
2256
		struct ref *ref = make_linked_ref(refname, &info->stale_refs_tail);
2257
		oidcpy(&ref->new_oid, oid);
2258
	}
2259

2260 2261
clean_exit:
	string_list_clear(&matches, 0);
2262 2263 2264
	return 0;
}

2265
struct ref *get_stale_heads(struct refspec *refs, int ref_count, struct ref *fetch_map)
2266 2267
{
	struct ref *ref, *stale_refs = NULL;
2268
	struct string_list ref_names = STRING_LIST_INIT_NODUP;
2269
	struct stale_heads_info info;
2270

2271 2272
	info.ref_names = &ref_names;
	info.stale_refs_tail = &stale_refs;
2273 2274
	info.refs = refs;
	info.ref_count = ref_count;
2275
	for (ref = fetch_map; ref; ref = ref->next)
2276
		string_list_append(&ref_names, ref->name);
2277
	string_list_sort(&ref_names);
2278 2279 2280 2281
	for_each_ref(get_stale_heads_cb, &info);
	string_list_clear(&ref_names, 0);
	return stale_refs;
}
2282 2283 2284 2285

/*
 * Compare-and-swap
 */
2286
static void clear_cas_option(struct push_cas_option *cas)
2287 2288 2289 2290 2291 2292 2293 2294 2295 2296 2297 2298 2299 2300 2301 2302 2303 2304 2305 2306 2307
{
	int i;

	for (i = 0; i < cas->nr; i++)
		free(cas->entry[i].refname);
	free(cas->entry);
	memset(cas, 0, sizeof(*cas));
}

static struct push_cas *add_cas_entry(struct push_cas_option *cas,
				      const char *refname,
				      size_t refnamelen)
{
	struct push_cas *entry;
	ALLOC_GROW(cas->entry, cas->nr + 1, cas->alloc);
	entry = &cas->entry[cas->nr++];
	memset(entry, 0, sizeof(*entry));
	entry->refname = xmemdupz(refname, refnamelen);
	return entry;
}

2308
static int parse_push_cas_option(struct push_cas_option *cas, const char *arg, int unset)
2309 2310 2311 2312 2313 2314 2315 2316 2317 2318 2319 2320 2321 2322 2323 2324 2325 2326 2327 2328 2329
{
	const char *colon;
	struct push_cas *entry;

	if (unset) {
		/* "--no-<option>" */
		clear_cas_option(cas);
		return 0;
	}

	if (!arg) {
		/* just "--<option>" */
		cas->use_tracking_for_rest = 1;
		return 0;
	}

	/* "--<option>=refname" or "--<option>=refname:value" */
	colon = strchrnul(arg, ':');
	entry = add_cas_entry(cas, arg, colon - arg);
	if (!*colon)
		entry->use_tracking = 1;
2330
	else if (!colon[1])
2331 2332
		oidclr(&entry->expect);
	else if (get_oid(colon + 1, &entry->expect))
2333 2334 2335 2336 2337 2338 2339 2340
		return error("cannot parse expected object name '%s'", colon + 1);
	return 0;
}

int parseopt_push_cas_option(const struct option *opt, const char *arg, int unset)
{
	return parse_push_cas_option(opt->value, arg, unset);
}
2341 2342 2343 2344 2345 2346 2347 2348 2349 2350 2351 2352 2353

int is_empty_cas(const struct push_cas_option *cas)
{
	return !cas->use_tracking_for_rest && !cas->nr;
}

/*
 * Look at remote.fetch refspec and see if we have a remote
 * tracking branch for the refname there.  Fill its current
 * value in sha1[].
 * If we cannot do so, return negative to signal an error.
 */
static int remote_tracking(struct remote *remote, const char *refname,
2354
			   struct object_id *oid)
2355 2356 2357 2358 2359 2360
{
	char *dst;

	dst = apply_refspecs(remote->fetch, remote->fetch_refspec_nr, refname);
	if (!dst)
		return -1; /* no tracking ref for refname at remote */
2361
	if (read_ref(dst, oid))
2362 2363 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374
		return -1; /* we know what the tracking ref is but we cannot read it */
	return 0;
}

static void apply_cas(struct push_cas_option *cas,
		      struct remote *remote,
		      struct ref *ref)
{
	int i;

	/* Find an explicit --<option>=<name>[:<value>] entry */
	for (i = 0; i < cas->nr; i++) {
		struct push_cas *entry = &cas->entry[i];
2375
		if (!refname_match(entry->refname, ref->name))
2376 2377 2378
			continue;
		ref->expect_old_sha1 = 1;
		if (!entry->use_tracking)
2379
			oidcpy(&ref->old_oid_expect, &entry->expect);
2380
		else if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
2381
			oidclr(&ref->old_oid_expect);
2382 2383 2384 2385 2386 2387 2388 2389
		return;
	}

	/* Are we using "--<option>" to cover all? */
	if (!cas->use_tracking_for_rest)
		return;

	ref->expect_old_sha1 = 1;
2390
	if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
2391
		oidclr(&ref->old_oid_expect);
2392 2393 2394 2395 2396 2397 2398 2399 2400 2401
}

void apply_push_cas(struct push_cas_option *cas,
		    struct remote *remote,
		    struct ref *remote_refs)
{
	struct ref *ref;
	for (ref = remote_refs; ref; ref = ref->next)
		apply_cas(cas, remote, ref);
}