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

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

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

const struct refspec *tag_refspec = &s_tag_refspec;

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

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

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

static struct branch *current_branch;
53
static const char *pushremote_name;
54

55
static struct rewrites rewrites;
56
static struct rewrites rewrites_push;
57

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

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

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

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

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

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

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

111 112 113 114 115 116
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;
}

117 118 119 120 121 122 123 124 125 126 127 128 129
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);
}

130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148
struct remotes_hash_key {
	const char *str;
	int len;
};

static int remotes_hash_cmp(const struct remote *a, const struct remote *b, const struct remotes_hash_key *key)
{
	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)
		hashmap_init(&remotes_hash, (hashmap_cmp_fn)remotes_hash_cmp, 0);
}

149 150
static struct remote *make_remote(const char *name, int len)
{
151 152 153
	struct remote *ret, *replaced;
	struct remotes_hash_key lookup;
	struct hashmap_entry lookup_entry;
154

155 156 157 158 159 160 161 162 163 164
	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;
165

D
Daniel Barkalow 已提交
166
	ret = xcalloc(1, sizeof(struct remote));
167
	ret->prune = -1;  /* unspecified */
D
Daniel Barkalow 已提交
168 169
	ALLOC_GROW(remotes, remotes_nr + 1, remotes_alloc);
	remotes[remotes_nr++] = ret;
170 171 172 173 174
	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 已提交
175
	return ret;
176 177
}

178 179
static void add_merge(struct branch *branch, const char *name)
{
D
Daniel Barkalow 已提交
180 181 182
	ALLOC_GROW(branch->merge_name, branch->merge_nr + 1,
		   branch->merge_alloc);
	branch->merge_name[branch->merge_nr++] = name;
183 184 185 186
}

static struct branch *make_branch(const char *name, int len)
{
D
Daniel Barkalow 已提交
187 188
	struct branch *ret;
	int i;
189

D
Daniel Barkalow 已提交
190 191 192 193 194
	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];
195 196
	}

D
Daniel Barkalow 已提交
197 198 199
	ALLOC_GROW(branches, branches_nr + 1, branches_alloc);
	ret = xcalloc(1, sizeof(struct branch));
	branches[branches_nr++] = ret;
200
	if (len)
D
Daniel Barkalow 已提交
201
		ret->name = xstrndup(name, len);
202
	else
D
Daniel Barkalow 已提交
203
		ret->name = xstrdup(name);
204
	ret->refname = xstrfmt("refs/heads/%s", ret->name);
205

D
Daniel Barkalow 已提交
206
	return ret;
207 208
}

209
static struct rewrite *make_rewrite(struct rewrites *r, const char *base, int len)
210 211 212 213
{
	struct rewrite *ret;
	int i;

214
	for (i = 0; i < r->rewrite_nr; i++) {
215
		if (len
216 217 218 219
		    ? (len == r->rewrite[i]->baselen &&
		       !strncmp(base, r->rewrite[i]->base, len))
		    : !strcmp(base, r->rewrite[i]->base))
			return r->rewrite[i];
220 221
	}

222
	ALLOC_GROW(r->rewrite, r->rewrite_nr + 1, r->rewrite_alloc);
223
	ret = xcalloc(1, sizeof(struct rewrite));
224
	r->rewrite[r->rewrite_nr++] = ret;
225
	if (len) {
226
		ret->base = xstrndup(base, len);
227 228 229
		ret->baselen = len;
	}
	else {
230
		ret->base = xstrdup(base);
231 232
		ret->baselen = strlen(base);
	}
233 234 235 236 237 238
	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);
239 240 241
	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++;
242 243
}

244 245 246 247 248 249 250
static const char *skip_spaces(const char *s)
{
	while (isspace(*s))
		s++;
	return s;
}

251 252
static void read_remotes_file(struct remote *remote)
{
253
	struct strbuf buf = STRBUF_INIT;
254 255 256 257
	FILE *f = fopen(git_path("remotes/%s", remote->name), "r");

	if (!f)
		return;
258
	remote->origin = REMOTE_REMOTES;
259
	while (strbuf_getline(&buf, f) != EOF) {
260
		const char *v;
261

262
		strbuf_rtrim(&buf);
263

264 265 266 267 268 269
		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)));
270
	}
271
	strbuf_release(&buf);
272 273 274 275 276
	fclose(f);
}

static void read_branches_file(struct remote *remote)
{
277
	char *frag;
278 279
	struct strbuf buf = STRBUF_INIT;
	FILE *f = fopen(git_path("branches/%s", remote->name), "r");
280 281 282

	if (!f)
		return;
283

284
	strbuf_getline_lf(&buf, f);
285
	fclose(f);
286 287 288
	strbuf_trim(&buf);
	if (!buf.len) {
		strbuf_release(&buf);
289
		return;
290 291
	}

292
	remote->origin = REMOTE_BRANCHES;
293 294

	/*
295
	 * The branches file would have URL and optionally
296
	 * #branch specified.  The "master" (or specified) branch is
297 298
	 * fetched and stored in the local branch matching the
	 * remote name.
299
	 */
300 301
	frag = strchr(buf.buf, '#');
	if (frag)
302
		*(frag++) = '\0';
303 304 305 306 307 308
	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));
309

310 311 312 313
	/*
	 * Cogito compatible push: push current HEAD to remote #branch
	 * (master if missing)
	 */
314
	add_push_refspec(remote, xstrfmt("HEAD:refs/heads/%s", frag));
315
	remote->fetch_tags = 1; /* always auto-follow */
316 317
}

318
static int handle_config(const char *key, const char *value, void *cb)
319 320 321 322
{
	const char *name;
	const char *subkey;
	struct remote *remote;
323
	struct branch *branch;
324
	if (starts_with(key, "branch.")) {
325 326 327 328
		name = key + 7;
		subkey = strrchr(name, '.');
		if (!subkey)
			return 0;
329
		branch = make_branch(name, subkey - name);
330
		if (!strcmp(subkey, ".remote")) {
331
			return git_config_string(&branch->remote_name, key, value);
332
		} else if (!strcmp(subkey, ".pushremote")) {
333
			return git_config_string(&branch->pushremote_name, key, value);
334 335 336
		} else if (!strcmp(subkey, ".merge")) {
			if (!value)
				return config_error_nonbool(key);
337
			add_merge(branch, xstrdup(value));
338
		}
339
		return 0;
340
	}
341
	if (starts_with(key, "url.")) {
342
		struct rewrite *rewrite;
343
		name = key + 4;
344 345 346 347
		subkey = strrchr(name, '.');
		if (!subkey)
			return 0;
		if (!strcmp(subkey, ".insteadof")) {
348 349 350 351 352 353
			rewrite = make_rewrite(&rewrites, name, subkey - name);
			if (!value)
				return config_error_nonbool(key);
			add_instead_of(rewrite, xstrdup(value));
		} else if (!strcmp(subkey, ".pushinsteadof")) {
			rewrite = make_rewrite(&rewrites_push, name, subkey - name);
354 355 356 357 358
			if (!value)
				return config_error_nonbool(key);
			add_instead_of(rewrite, xstrdup(value));
		}
	}
359

360
	if (!starts_with(key,  "remote."))
361 362
		return 0;
	name = key + 7;
363 364 365 366 367 368

	/* Handle remote.* variables */
	if (!strcmp(name, "pushdefault"))
		return git_config_string(&pushremote_name, key, value);

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

440 441 442 443
static void alias_all_urls(void)
{
	int i, j;
	for (i = 0; i < remotes_nr; i++) {
444
		int add_pushurl_aliases;
445 446
		if (!remotes[i])
			continue;
447
		for (j = 0; j < remotes[i]->pushurl_nr; j++) {
448
			remotes[i]->pushurl[j] = alias_url(remotes[i]->pushurl[j], &rewrites);
449
		}
450 451 452 453 454 455
		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);
		}
456 457 458
	}
}

459 460
static void read_config(void)
{
461
	static int loaded;
462
	struct object_id oid;
463 464
	const char *head_ref;
	int flag;
465 466

	if (loaded)
467
		return;
468 469
	loaded = 1;

470
	current_branch = NULL;
471
	head_ref = resolve_ref_unsafe("HEAD", 0, oid.hash, &flag);
472
	if (head_ref && (flag & REF_ISSYMREF) &&
473 474
	    skip_prefix(head_ref, "refs/heads/", &head_ref)) {
		current_branch = make_branch(head_ref, 0);
475
	}
476
	git_config(handle_config, NULL);
477
	alias_all_urls();
478 479
}

480 481 482 483 484 485
/*
 * This function frees a refspec array.
 * Warning: code paths should be checked to ensure that the src
 *          and dst pointers are always freeable pointers as well
 *          as the refspec pointer itself.
 */
486
static void free_refspecs(struct refspec *refspec, int nr_refspec)
487 488 489 490 491 492 493 494 495 496 497 498 499
{
	int i;

	if (!refspec)
		return;

	for (i = 0; i < nr_refspec; i++) {
		free(refspec[i].src);
		free(refspec[i].dst);
	}
	free(refspec);
}

500
static struct refspec *parse_refspec_internal(int nr_refspec, const char **refspec, int fetch, int verify)
501 502
{
	int i;
503
	struct refspec *rs = xcalloc(nr_refspec, sizeof(*rs));
504

505
	for (i = 0; i < nr_refspec; i++) {
506
		size_t llen;
507 508
		int is_glob;
		const char *lhs, *rhs;
509
		int flags;
510

B
Benjamin Kramer 已提交
511
		is_glob = 0;
512 513 514

		lhs = refspec[i];
		if (*lhs == '+') {
515
			rs[i].force = 1;
516
			lhs++;
517
		}
518 519

		rhs = strrchr(lhs, ':');
520 521 522

		/*
		 * Before going on, special case ":" (or "+:") as a refspec
523
		 * for pushing matching refs.
524 525 526 527 528 529
		 */
		if (!fetch && rhs == lhs && rhs[1] == '\0') {
			rs[i].matching = 1;
			continue;
		}

530
		if (rhs) {
531
			size_t rlen = strlen(++rhs);
532
			is_glob = (1 <= rlen && strchr(rhs, '*'));
D
Daniel Barkalow 已提交
533
			rs[i].dst = xstrndup(rhs, rlen);
534
		}
D
Daniel Barkalow 已提交
535

536
		llen = (rhs ? (rhs - lhs - 1) : strlen(lhs));
537
		if (1 <= llen && memchr(lhs, '*', llen)) {
538 539 540 541 542
			if ((rhs && !is_glob) || (!rhs && fetch))
				goto invalid;
			is_glob = 1;
		} else if (rhs && is_glob) {
			goto invalid;
D
Daniel Barkalow 已提交
543
		}
544

545 546
		rs[i].pattern = is_glob;
		rs[i].src = xstrndup(lhs, llen);
547
		flags = REFNAME_ALLOW_ONELEVEL | (is_glob ? REFNAME_REFSPEC_PATTERN : 0);
548 549

		if (fetch) {
550
			struct object_id unused;
551

552
			/* LHS */
553
			if (!*rs[i].src)
554
				; /* empty is ok; it means "HEAD" */
555
			else if (llen == GIT_SHA1_HEXSZ && !get_oid_hex(rs[i].src, &unused))
556
				rs[i].exact_sha1 = 1; /* ok */
557 558 559
			else if (!check_refname_format(rs[i].src, flags))
				; /* valid looking ref is ok */
			else
560
				goto invalid;
561
			/* RHS */
562
			if (!rs[i].dst)
563
				; /* missing is ok; it is the same as empty */
564
			else if (!*rs[i].dst)
565 566 567 568
				; /* empty is ok; it means "do not store" */
			else if (!check_refname_format(rs[i].dst, flags))
				; /* valid looking ref is ok */
			else
569
				goto invalid;
570 571 572 573 574 575 576 577 578 579 580
		} 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) {
581
				if (check_refname_format(rs[i].src, flags))
582 583 584 585 586 587 588 589 590 591 592 593
					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) {
594
				if (check_refname_format(rs[i].src, flags))
595 596 597 598
					goto invalid;
			} else if (!*rs[i].dst) {
				goto invalid;
			} else {
599
				if (check_refname_format(rs[i].dst, flags))
600 601
					goto invalid;
			}
D
Daniel Barkalow 已提交
602
		}
603 604
	}
	return rs;
605 606

 invalid:
607
	if (verify) {
608 609 610 611 612 613
		/*
		 * 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.
		 */
		free_refspecs(rs, i+1);
614 615
		return NULL;
	}
616 617 618
	die("Invalid refspec '%s'", refspec[i]);
}

619 620 621 622
int valid_fetch_refspec(const char *fetch_refspec_str)
{
	struct refspec *refspec;

623
	refspec = parse_refspec_internal(1, &fetch_refspec_str, 1, 1);
624
	free_refspecs(refspec, 1);
625 626 627
	return !!refspec;
}

628 629
struct refspec *parse_fetch_refspec(int nr_refspec, const char **refspec)
{
630
	return parse_refspec_internal(nr_refspec, refspec, 1, 0);
631 632
}

633
static struct refspec *parse_push_refspec(int nr_refspec, const char **refspec)
634
{
635
	return parse_refspec_internal(nr_refspec, refspec, 0, 0);
636 637
}

638 639 640 641 642 643 644 645 646 647
void free_refspec(int nr_refspec, struct refspec *refspec)
{
	int i;
	for (i = 0; i < nr_refspec; i++) {
		free(refspec[i].src);
		free(refspec[i].dst);
	}
	free(refspec);
}

648 649
static int valid_remote_nick(const char *name)
{
650
	if (!name[0] || is_dot_or_dotdot(name))
651 652 653 654
		return 0;
	return !strchr(name, '/'); /* no slash */
}

655 656 657 658 659 660 661 662 663 664 665 666
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";
}

667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683
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);
}

static struct remote *remote_get_1(const char *name,
				   const char *(*get_default)(struct branch *, int *))
684 685
{
	struct remote *ret;
686
	int name_given = 0;
687

688 689
	read_config();

690 691
	if (name)
		name_given = 1;
692 693
	else
		name = get_default(current_branch, &name_given);
694

695
	ret = make_remote(name, 0);
696
	if (valid_remote_nick(name)) {
697
		if (!valid_remote(ret))
698
			read_remotes_file(ret);
699
		if (!valid_remote(ret))
700 701
			read_branches_file(ret);
	}
702
	if (name_given && !valid_remote(ret))
703
		add_url_alias(ret, name);
704
	if (!valid_remote(ret))
705
		return NULL;
706 707
	ret->fetch = parse_fetch_refspec(ret->fetch_refspec_nr, ret->fetch_refspec);
	ret->push = parse_push_refspec(ret->push_refspec_nr, ret->push_refspec);
708 709
	return ret;
}
710

711 712
struct remote *remote_get(const char *name)
{
713
	return remote_get_1(name, remote_for_branch);
714 715 716 717
}

struct remote *pushremote_get(const char *name)
{
718
	return remote_get_1(name, pushremote_for_branch);
719 720
}

721 722
int remote_is_configured(const char *name)
{
723 724
	struct remotes_hash_key lookup;
	struct hashmap_entry lookup_entry;
725 726
	read_config();

727 728 729 730 731 732
	init_remotes_hash();
	lookup.str = name;
	lookup.len = strlen(name);
	hashmap_entry_init(&lookup_entry, memhash(name, lookup.len));

	return hashmap_get(&remotes_hash, &lookup_entry, &lookup) != NULL;
733 734
}

735 736 737 738
int for_each_remote(each_remote_fn fn, void *priv)
{
	int i, result = 0;
	read_config();
D
Daniel Barkalow 已提交
739
	for (i = 0; i < remotes_nr && !result; i++) {
740 741 742 743
		struct remote *r = remotes[i];
		if (!r)
			continue;
		if (!r->fetch)
744 745
			r->fetch = parse_fetch_refspec(r->fetch_refspec_nr,
						       r->fetch_refspec);
746
		if (!r->push)
747 748
			r->push = parse_push_refspec(r->push_refspec_nr,
						     r->push_refspec);
749 750 751 752 753
		result = fn(r, priv);
	}
	return result;
}

754 755
static void handle_duplicate(struct ref *ref1, struct ref *ref2)
{
756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777
	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"));
		}
	}
778 779 780 781
	free(ref2->peer_ref);
	free(ref2);
}

782
struct ref *ref_remove_duplicates(struct ref *ref_map)
783
{
784
	struct string_list refs = STRING_LIST_INIT_NODUP;
785 786
	struct ref *retval = NULL;
	struct ref **p = &retval;
787

788 789 790 791 792
	while (ref_map) {
		struct ref *ref = ref_map;

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

794 795 796
		if (!ref->peer_ref) {
			*p = ref;
			p = &ref->next;
797
		} else {
798 799 800 801 802
			struct string_list_item *item =
				string_list_insert(&refs, ref->peer_ref->name);

			if (item->util) {
				/* Entry already existed */
803
				handle_duplicate((struct ref *)item->util, ref);
804 805 806 807 808
			} else {
				*p = ref;
				p = &ref->next;
				item->util = ref;
			}
809 810
		}
	}
811

812
	string_list_clear(&refs, 0);
813
	return retval;
814 815
}

816
int remote_has_url(struct remote *remote, const char *url)
817 818
{
	int i;
819 820
	for (i = 0; i < remote->url_nr; i++) {
		if (!strcmp(remote->url[i], url))
821 822 823 824 825
			return 1;
	}
	return 0;
}

826 827
static int match_name_with_pattern(const char *key, const char *name,
				   const char *value, char **result)
828
{
D
Daniel Barkalow 已提交
829 830
	const char *kstar = strchr(key, '*');
	size_t klen;
831 832
	size_t ksuffixlen;
	size_t namelen;
D
Daniel Barkalow 已提交
833 834 835 836
	int ret;
	if (!kstar)
		die("Key '%s' of pattern had no '*'", key);
	klen = kstar - key;
837 838 839 840
	ksuffixlen = strlen(kstar + 1);
	namelen = strlen(name);
	ret = !strncmp(name, key, klen) && namelen >= klen + ksuffixlen &&
		!memcmp(name + namelen - ksuffixlen, kstar + 1, ksuffixlen);
841
	if (ret && value) {
842
		struct strbuf sb = STRBUF_INIT;
D
Daniel Barkalow 已提交
843 844 845
		const char *vstar = strchr(value, '*');
		if (!vstar)
			die("Value '%s' of pattern has no '*'", value);
846 847 848 849
		strbuf_add(&sb, value, vstar - value);
		strbuf_add(&sb, name + klen, namelen - klen - ksuffixlen);
		strbuf_addstr(&sb, vstar + 1);
		*result = strbuf_detach(&sb, NULL);
850
	}
851 852 853
	return ret;
}

854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879
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);
		}
	}
}

880
int query_refspecs(struct refspec *refs, int ref_count, struct refspec *query)
881 882
{
	int i;
883
	int find_src = !query->src;
884 885
	const char *needle = find_src ? query->dst : query->src;
	char **result = find_src ? &query->src : &query->dst;
886

887 888
	if (find_src && !query->dst)
		return error("query_refspecs: need either src or dst");
889

890 891 892 893
	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;
894

895
		if (!refspec->dst)
896
			continue;
897
		if (refspec->pattern) {
898
			if (match_name_with_pattern(key, needle, value, result)) {
899
				query->force = refspec->force;
900 901
				return 0;
			}
902 903
		} else if (!strcmp(needle, key)) {
			*result = xstrdup(value);
904
			query->force = refspec->force;
905
			return 0;
906 907 908 909 910
		}
	}
	return -1;
}

911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929
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 已提交
930 931 932 933 934 935 936 937 938 939
static struct ref *alloc_ref_with_prefix(const char *prefix, size_t prefixlen,
		const char *name)
{
	size_t len = strlen(name);
	struct ref *ref = xcalloc(1, sizeof(struct ref) + prefixlen + len + 1);
	memcpy(ref->name, prefix, prefixlen);
	memcpy(ref->name + prefixlen, name, len);
	return ref;
}

940
struct ref *alloc_ref(const char *name)
941
{
942
	return alloc_ref_with_prefix("", 0, name);
943 944
}

J
Jeff King 已提交
945
struct ref *copy_ref(const struct ref *ref)
946
{
947 948 949 950 951 952 953 954
	struct ref *cpy;
	size_t len;
	if (!ref)
		return NULL;
	len = strlen(ref->name);
	cpy = xmalloc(sizeof(struct ref) + len + 1);
	memcpy(cpy, ref, sizeof(struct ref) + len + 1);
	cpy->next = NULL;
955 956
	cpy->symref = xstrdup_or_null(ref->symref);
	cpy->remote_status = xstrdup_or_null(ref->remote_status);
957 958
	cpy->peer_ref = copy_ref(ref->peer_ref);
	return cpy;
959 960
}

961 962 963 964 965 966 967 968 969 970 971 972
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;
}

973
static void free_ref(struct ref *ref)
974 975 976
{
	if (!ref)
		return;
977
	free_ref(ref->peer_ref);
978 979 980 981 982
	free(ref->remote_status);
	free(ref->symref);
	free(ref);
}

983 984 985 986 987
void free_refs(struct ref *ref)
{
	struct ref *next;
	while (ref) {
		next = ref->next;
988
		free_ref(ref);
989 990 991 992
		ref = next;
	}
}

993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013
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);
}

1014 1015 1016
int count_refspec_match(const char *pattern,
			struct ref *refs,
			struct ref **matched_ref)
1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027
{
	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);

1028
		if (!refname_match(pattern, name))
1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040
			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 &&
1041 1042
		    !starts_with(name, "refs/heads/") &&
		    !starts_with(name, "refs/tags/")) {
1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058
			/* 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) {
1059 1060
		if (matched_ref)
			*matched_ref = matched_weak;
1061 1062 1063
		return weak_match;
	}
	else {
1064 1065
		if (matched_ref)
			*matched_ref = matched;
1066 1067 1068 1069
		return match;
	}
}

1070
static void tail_link_ref(struct ref *ref, struct ref ***tail)
1071 1072
{
	**tail = ref;
1073 1074
	while (ref->next)
		ref = ref->next;
1075 1076 1077
	*tail = &ref->next;
}

1078 1079 1080
static struct ref *alloc_delete_ref(void)
{
	struct ref *ref = alloc_ref("(delete)");
1081
	oidclr(&ref->new_oid);
1082 1083 1084
	return ref;
}

1085 1086
static int try_explicit_object_name(const char *name,
				    struct ref **match)
1087
{
1088
	struct object_id oid;
1089

1090 1091 1092 1093 1094 1095
	if (!*name) {
		if (match)
			*match = alloc_delete_ref();
		return 0;
	}

1096
	if (get_sha1(name, oid.hash))
1097 1098 1099 1100
		return -1;

	if (match) {
		*match = alloc_ref(name);
1101
		oidcpy(&(*match)->new_oid, &oid);
1102 1103
	}
	return 0;
1104 1105
}

1106
static struct ref *make_linked_ref(const char *name, struct ref ***tail)
1107
{
1108
	struct ref *ret = alloc_ref(name);
1109 1110
	tail_link_ref(ret, tail);
	return ret;
1111
}
1112

1113 1114 1115
static char *guess_ref(const char *name, struct ref *peer)
{
	struct strbuf buf = STRBUF_INIT;
1116
	struct object_id oid;
1117

1118
	const char *r = resolve_ref_unsafe(peer->name, RESOLVE_REF_READING,
1119
					   oid.hash, NULL);
1120 1121 1122
	if (!r)
		return NULL;

1123
	if (starts_with(r, "refs/heads/"))
1124
		strbuf_addstr(&buf, "refs/heads/");
1125
	else if (starts_with(r, "refs/tags/"))
1126 1127 1128 1129 1130 1131 1132 1133
		strbuf_addstr(&buf, "refs/tags/");
	else
		return NULL;

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

1134 1135 1136 1137 1138 1139 1140
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:
1141 1142
		if (allocated_match)
			*allocated_match = 0;
1143 1144 1145 1146 1147 1148
		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.
		 */
1149
		if (try_explicit_object_name(rs->src, match) < 0)
1150
			return error("src refspec %s does not match any.", rs->src);
1151 1152
		if (allocated_match)
			*allocated_match = 1;
1153 1154 1155 1156 1157 1158
		return 0;
	default:
		return error("src refspec %s matches more than one.", rs->src);
	}
}

1159 1160
static int match_explicit(struct ref *src, struct ref *dst,
			  struct ref ***dst_tail,
1161
			  struct refspec *rs)
1162
{
1163
	struct ref *matched_src, *matched_dst;
1164
	int allocated_src;
1165

1166
	const char *dst_value = rs->dst;
1167
	char *dst_guess;
1168

1169
	if (rs->pattern || rs->matching)
1170
		return 0;
1171

1172
	matched_src = matched_dst = NULL;
1173 1174
	if (match_explicit_lhs(src, rs, &matched_src, &allocated_src) < 0)
		return -1;
1175

1176
	if (!dst_value) {
1177
		struct object_id oid;
1178 1179
		int flag;

1180 1181
		dst_value = resolve_ref_unsafe(matched_src->name,
					       RESOLVE_REF_READING,
1182
					       oid.hash, &flag);
1183 1184
		if (!dst_value ||
		    ((flag & REF_ISSYMREF) &&
1185
		     !starts_with(dst_value, "refs/heads/")))
1186 1187
			die("%s cannot be resolved to branch.",
			    matched_src->name);
1188
	}
1189

1190 1191 1192 1193
	switch (count_refspec_match(dst_value, dst, &matched_dst)) {
	case 1:
		break;
	case 0:
1194
		if (starts_with(dst_value, "refs/"))
1195
			matched_dst = make_linked_ref(dst_value, dst_tail);
1196
		else if (is_null_oid(&matched_src->new_oid))
1197 1198
			error("unable to delete '%s': remote ref does not exist",
			      dst_value);
1199
		else if ((dst_guess = guess_ref(dst_value, matched_src)))
1200
			matched_dst = make_linked_ref(dst_guess, dst_tail);
1201
		else
1202 1203 1204 1205 1206 1207
			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);
1208 1209
		break;
	default:
1210
		matched_dst = NULL;
1211 1212 1213 1214
		error("dst refspec %s matches more than one.",
		      dst_value);
		break;
	}
1215 1216 1217 1218
	if (!matched_dst)
		return -1;
	if (matched_dst->peer_ref)
		return error("dst ref %s receives from more than one src.",
1219 1220
		      matched_dst->name);
	else {
1221 1222 1223
		matched_dst->peer_ref = allocated_src ?
					matched_src :
					copy_ref(matched_src);
1224
		matched_dst->force = rs->force;
1225
	}
1226
	return 0;
1227 1228 1229 1230 1231 1232 1233 1234
}

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++)
1235 1236
		errs += match_explicit(src, dst, dst_tail, &rs[i]);
	return errs;
1237 1238
}

1239
static char *get_ref_match(const struct refspec *rs, int rs_nr, const struct ref *ref,
F
Felipe Contreras 已提交
1240
		int send_mirror, int direction, const struct refspec **ret_pat)
1241
{
1242 1243
	const struct refspec *pat;
	char *name;
1244
	int i;
1245
	int matching_refs = -1;
1246
	for (i = 0; i < rs_nr; i++) {
1247 1248 1249 1250 1251 1252
		if (rs[i].matching &&
		    (matching_refs == -1 || rs[i].force)) {
			matching_refs = i;
			continue;
		}

1253 1254
		if (rs[i].pattern) {
			const char *dst_side = rs[i].dst ? rs[i].dst : rs[i].src;
F
Felipe Contreras 已提交
1255 1256 1257 1258 1259 1260
			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) {
1261 1262 1263 1264
				matching_refs = i;
				break;
			}
		}
1265
	}
1266
	if (matching_refs == -1)
1267
		return NULL;
1268 1269 1270 1271 1272 1273 1274 1275

	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.
		 */
1276
		if (!send_mirror && !starts_with(ref->name, "refs/heads/"))
1277 1278 1279 1280 1281 1282
			return NULL;
		name = xstrdup(ref->name);
	}
	if (ret_pat)
		*ret_pat = pat;
	return name;
1283 1284
}

1285 1286 1287 1288 1289 1290 1291 1292
static struct ref **tail_ref(struct ref **head)
{
	struct ref **tail = head;
	while (*tail)
		tail = &((*tail)->next);
	return tail;
}

J
Junio C Hamano 已提交
1293 1294 1295 1296 1297
struct tips {
	struct commit **tip;
	int nr, alloc;
};

1298
static void add_to_tips(struct tips *tips, const struct object_id *oid)
J
Junio C Hamano 已提交
1299 1300 1301
{
	struct commit *commit;

1302
	if (is_null_oid(oid))
J
Junio C Hamano 已提交
1303
		return;
1304
	commit = lookup_commit_reference_gently(oid->hash, 1);
J
Junio C Hamano 已提交
1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326
	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 &&
1327
		    !is_null_oid(&ref->peer_ref->new_oid))
1328
			add_to_tips(&sent_tips, &ref->peer_ref->new_oid);
J
Junio C Hamano 已提交
1329
		else
1330
			add_to_tips(&sent_tips, &ref->old_oid);
1331
		if (starts_with(ref->name, "refs/tags/"))
J
Junio C Hamano 已提交
1332 1333 1334 1335
			string_list_append(&dst_tag, ref->name);
	}
	clear_commit_marks_many(sent_tips.nr, sent_tips.tip, TMP_MARK);

1336
	string_list_sort(&dst_tag);
J
Junio C Hamano 已提交
1337 1338 1339

	/* Collect tags they do not have. */
	for (ref = src; ref; ref = ref->next) {
1340
		if (!starts_with(ref->name, "refs/tags/"))
J
Junio C Hamano 已提交
1341 1342 1343
			continue; /* not a tag */
		if (string_list_has_string(&dst_tag, ref->name))
			continue; /* they already have it */
1344
		if (sha1_object_info(ref->new_oid.hash, NULL) != OBJ_TAG)
J
Junio C Hamano 已提交
1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363
			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;

1364
			if (is_null_oid(&ref->new_oid))
J
Junio C Hamano 已提交
1365
				continue;
1366
			commit = lookup_commit_reference_gently(ref->new_oid.hash, 1);
J
Junio C Hamano 已提交
1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379
			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);
1380
			oidcpy(&dst_ref->new_oid, &ref->new_oid);
J
Junio C Hamano 已提交
1381 1382 1383 1384 1385 1386 1387
			dst_ref->peer_ref = copy_ref(ref);
		}
	}
	string_list_clear(&src_tag, 0);
	free(sent_tips.tip);
}

1388 1389 1390 1391 1392 1393 1394 1395
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;
}

1396 1397 1398 1399 1400
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;

1401
	string_list_sort(ref_index);
1402 1403
}

1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428
/*
 * 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;
}

1429
/*
1430 1431 1432 1433 1434 1435
 * 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).
1436
 */
1437 1438
int match_push_refs(struct ref *src, struct ref **dst,
		    int nr_refspec, const char **refspec, int flags)
1439
{
1440
	struct refspec *rs;
A
Andy Whitcroft 已提交
1441 1442
	int send_all = flags & MATCH_REFS_ALL;
	int send_mirror = flags & MATCH_REFS_MIRROR;
F
Felipe Contreras 已提交
1443
	int send_prune = flags & MATCH_REFS_PRUNE;
1444
	int errs;
1445
	static const char *default_refspec[] = { ":", NULL };
1446
	struct ref *ref, **dst_tail = tail_ref(dst);
1447
	struct string_list dst_ref_index = STRING_LIST_INIT_NODUP;
1448

1449 1450 1451 1452 1453
	if (!nr_refspec) {
		nr_refspec = 1;
		refspec = default_refspec;
	}
	rs = parse_push_refspec(nr_refspec, (const char **) refspec);
1454
	errs = match_explicit_refs(src, *dst, &dst_tail, rs, nr_refspec);
1455 1456

	/* pick the remainder */
1457
	for (ref = src; ref; ref = ref->next) {
1458
		struct string_list_item *dst_item;
1459
		struct ref *dst_peer;
1460 1461
		const struct refspec *pat = NULL;
		char *dst_name;
1462

F
Felipe Contreras 已提交
1463
		dst_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_SRC, &pat);
1464
		if (!dst_name)
1465 1466
			continue;

1467 1468 1469 1470 1471
		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;
1472 1473 1474 1475 1476 1477 1478 1479 1480
		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 已提交
1481
				 * --all or --mirror.
1482 1483
				 */
				goto free_name;
A
Andy Whitcroft 已提交
1484

1485
			/* Create a new one and link it */
1486
			dst_peer = make_linked_ref(dst_name, &dst_tail);
1487
			oidcpy(&dst_peer->new_oid, &ref->new_oid);
1488 1489
			string_list_insert(&dst_ref_index,
				dst_peer->name)->util = dst_peer;
1490
		}
1491
		dst_peer->peer_ref = copy_ref(ref);
1492
		dst_peer->force = pat->force;
1493 1494
	free_name:
		free(dst_name);
1495
	}
J
Junio C Hamano 已提交
1496

1497 1498
	string_list_clear(&dst_ref_index, 0);

J
Junio C Hamano 已提交
1499 1500 1501
	if (flags & MATCH_REFS_FOLLOW_TAGS)
		add_missing_tags(src, dst, &dst_tail);

F
Felipe Contreras 已提交
1502
	if (send_prune) {
1503
		struct string_list src_ref_index = STRING_LIST_INIT_NODUP;
F
Felipe Contreras 已提交
1504 1505 1506 1507 1508 1509 1510 1511 1512 1513
		/* 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) {
1514 1515 1516 1517
				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 已提交
1518 1519 1520 1521
					ref->peer_ref = alloc_delete_ref();
				free(src_name);
			}
		}
1522
		string_list_clear(&src_ref_index, 0);
F
Felipe Contreras 已提交
1523
	}
1524 1525
	if (errs)
		return -1;
1526 1527
	return 0;
}
1528

1529
void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
1530
			     int force_update)
1531 1532 1533 1534
{
	struct ref *ref;

	for (ref = remote_refs; ref; ref = ref->next) {
1535
		int force_ref_update = ref->force || force_update;
1536
		int reject_reason = 0;
1537

1538
		if (ref->peer_ref)
1539
			oidcpy(&ref->new_oid, &ref->peer_ref->new_oid);
1540 1541 1542
		else if (!send_mirror)
			continue;

1543
		ref->deletion = is_null_oid(&ref->new_oid);
1544
		if (!ref->deletion &&
1545
			!oidcmp(&ref->old_oid, &ref->new_oid)) {
1546 1547 1548 1549
			ref->status = REF_STATUS_UPTODATE;
			continue;
		}

C
Chris Rorvick 已提交
1550
		/*
1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563
		 * Bypass the usual "must fast-forward" check but
		 * replace it with a weaker "the old value must be
		 * this value we observed".  If the remote ref has
		 * moved and is now different from what we expect,
		 * reject any push.
		 *
		 * 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) {
			if (ref->expect_old_no_trackback ||
1564
			    oidcmp(&ref->old_oid, &ref->old_oid_expect))
1565 1566 1567 1568 1569 1570
				reject_reason = REF_STATUS_REJECT_STALE;
		}

		/*
		 * The usual "must fast-forward" rules.
		 *
1571 1572 1573
		 * Decide whether an individual refspec A:B can be
		 * pushed.  The push will succeed if any of the
		 * following are true:
1574
		 *
C
Chris Rorvick 已提交
1575
		 * (1) the remote reference B does not exist
1576
		 *
C
Chris Rorvick 已提交
1577 1578
		 * (2) the remote reference B is being removed (i.e.,
		 *     pushing :B where no source is specified)
1579
		 *
1580 1581 1582
		 * (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.
1583
		 *
C
Chris Rorvick 已提交
1584 1585
		 * (4) it is forced using the +A:B notation, or by
		 *     passing the --force argument
1586 1587
		 */

1588
		else if (!ref->deletion && !is_null_oid(&ref->old_oid)) {
1589
			if (starts_with(ref->name, "refs/tags/"))
1590
				reject_reason = REF_STATUS_REJECT_ALREADY_EXISTS;
1591
			else if (!has_object_file(&ref->old_oid))
1592
				reject_reason = REF_STATUS_REJECT_FETCH_FIRST;
1593 1594
			else if (!lookup_commit_reference_gently(ref->old_oid.hash, 1) ||
				 !lookup_commit_reference_gently(ref->new_oid.hash, 1))
1595
				reject_reason = REF_STATUS_REJECT_NEEDS_FORCE;
1596
			else if (!ref_newer(&ref->new_oid, &ref->old_oid))
1597
				reject_reason = REF_STATUS_REJECT_NONFASTFORWARD;
1598
		}
1599 1600 1601 1602 1603 1604 1605 1606 1607

		/*
		 * "--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;
1608 1609 1610
	}
}

1611 1612
static void set_merge(struct branch *ret)
{
1613
	struct remote *remote;
1614
	char *ref;
1615
	struct object_id oid;
1616 1617
	int i;

1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630
	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;
	}

1631 1632
	remote = remote_get(ret->remote_name);

1633 1634 1635 1636
	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]);
1637
		if (!remote_find_tracking(remote, ret->merge[i]) ||
1638 1639 1640
		    strcmp(ret->remote_name, "."))
			continue;
		if (dwim_ref(ret->merge_name[i], strlen(ret->merge_name[i]),
1641
			     oid.hash, &ref) == 1)
1642 1643 1644 1645 1646 1647
			ret->merge[i]->dst = ref;
		else
			ret->merge[i]->dst = xstrdup(ret->merge_name[i]);
	}
}

1648 1649 1650 1651 1652 1653 1654 1655 1656
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);
1657
	set_merge(ret);
1658 1659 1660 1661 1662 1663 1664 1665
	return ret;
}

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

1666 1667 1668
int branch_merge_matches(struct branch *branch,
		                 int i,
		                 const char *refname)
1669
{
1670
	if (!branch || i < 0 || i >= branch->merge_nr)
1671
		return 0;
1672
	return refname_match(branch->merge[i]->src, refname);
1673
}
1674

1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690
__attribute((format (printf,2,3)))
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"));
1691 1692 1693 1694 1695 1696 1697

	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?
		 */
1698 1699 1700
		if (!ref_exists(branch->refname))
			return error_buf(err, _("no such branch: '%s'"),
					 branch->name);
1701 1702 1703 1704 1705 1706
		return error_buf(err,
				 _("no upstream configured for branch '%s'"),
				 branch->name);
	}

	if (!branch->merge[0]->dst)
1707 1708 1709 1710
		return error_buf(err,
				 _("upstream branch '%s' not stored as a remote-tracking branch"),
				 branch->merge[0]->src);

1711 1712 1713
	return branch->merge[0]->dst;
}

J
Jeff King 已提交
1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 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
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;

	if (!branch)
		return error_buf(err, _("HEAD does not point to a branch"));

	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)
{
	if (!branch->push_tracking_ref)
		branch->push_tracking_ref = branch_get_push_1(branch, err);
	return branch->push_tracking_ref;
}

1799 1800
static int ignore_symref_update(const char *refname)
{
1801
	struct object_id oid;
1802 1803
	int flag;

1804
	if (!resolve_ref_unsafe(refname, 0, oid.hash, &flag))
1805 1806 1807 1808
		return 0; /* non-existing refs are OK */
	return (flag & REF_ISSYMREF);
}

1809 1810 1811 1812 1813 1814 1815
/*
 * 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.
 */
1816
static struct ref *get_expanded_map(const struct ref *remote_refs,
1817 1818
				    const struct refspec *refspec)
{
1819
	const struct ref *ref;
1820 1821 1822 1823
	struct ref *ret = NULL;
	struct ref **tail = &ret;

	for (ref = remote_refs; ref; ref = ref->next) {
1824 1825
		char *expn_name = NULL;

1826 1827
		if (strchr(ref->name, '^'))
			continue; /* a dereference item */
1828
		if (match_name_with_pattern(refspec->src, ref->name,
1829 1830
					    refspec->dst, &expn_name) &&
		    !ignore_symref_update(expn_name)) {
1831 1832
			struct ref *cpy = copy_ref(ref);

1833
			cpy->peer_ref = alloc_ref(expn_name);
1834 1835 1836 1837 1838
			if (refspec->force)
				cpy->peer_ref->force = 1;
			*tail = cpy;
			tail = &cpy->next;
		}
1839
		free(expn_name);
1840 1841 1842 1843 1844
	}

	return ret;
}

1845
static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
1846
{
1847
	const struct ref *ref;
1848
	for (ref = refs; ref; ref = ref->next) {
1849
		if (refname_match(name, ref->name))
1850 1851 1852 1853 1854
			return ref;
	}
	return NULL;
}

1855
struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
1856
{
1857
	const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
1858 1859

	if (!ref)
1860
		return NULL;
1861 1862 1863 1864 1865 1866

	return copy_ref(ref);
}

static struct ref *get_local_ref(const char *name)
{
1867
	if (!name || name[0] == '\0')
1868 1869
		return NULL;

1870
	if (starts_with(name, "refs/"))
1871
		return alloc_ref(name);
1872

1873 1874 1875
	if (starts_with(name, "heads/") ||
	    starts_with(name, "tags/") ||
	    starts_with(name, "remotes/"))
R
René Scharfe 已提交
1876
		return alloc_ref_with_prefix("refs/", 5, name);
1877

R
René Scharfe 已提交
1878
	return alloc_ref_with_prefix("refs/heads/", 11, name);
1879 1880
}

1881
int get_fetch_map(const struct ref *remote_refs,
1882
		  const struct refspec *refspec,
1883 1884
		  struct ref ***tail,
		  int missing_ok)
1885
{
D
Daniel Barkalow 已提交
1886
	struct ref *ref_map, **rmp;
1887 1888 1889 1890

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

1893 1894
		if (refspec->exact_sha1) {
			ref_map = alloc_ref(name);
1895
			get_oid_hex(name, &ref_map->old_oid);
1896 1897 1898
		} else {
			ref_map = get_remote_ref(remote_refs, name);
		}
1899 1900 1901 1902 1903 1904 1905
		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;
		}
1906 1907
	}

D
Daniel Barkalow 已提交
1908 1909
	for (rmp = &ref_map; *rmp; ) {
		if ((*rmp)->peer_ref) {
1910
			if (!starts_with((*rmp)->peer_ref->name, "refs/") ||
1911
			    check_refname_format((*rmp)->peer_ref->name, 0)) {
D
Daniel Barkalow 已提交
1912 1913 1914 1915 1916 1917 1918 1919 1920 1921
				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);
1922 1923
	}

1924 1925
	if (ref_map)
		tail_link_ref(ref_map, tail);
1926 1927 1928

	return 0;
}
1929 1930 1931 1932 1933 1934 1935

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)) {
1936
			oidcpy(&ref->old_oid, &list->old_oid);
1937 1938 1939 1940
			return 0;
		}
	return 1;
}
1941

1942 1943 1944
static void unmark_and_free(struct commit_list *list, unsigned int mark)
{
	while (list) {
1945 1946
		struct commit *commit = pop_commit(&list);
		commit->object.flags &= ~mark;
1947 1948 1949
	}
}

1950
int ref_newer(const struct object_id *new_oid, const struct object_id *old_oid)
1951 1952 1953 1954 1955 1956
{
	struct object *o;
	struct commit *old, *new;
	struct commit_list *list, *used;
	int found = 0;

1957 1958
	/*
	 * Both new and old must be commit-ish and new is descendant of
1959 1960
	 * old.  Otherwise we require --force.
	 */
1961
	o = deref_tag(parse_object(old_oid->hash), NULL, 0);
1962 1963 1964 1965
	if (!o || o->type != OBJ_COMMIT)
		return 0;
	old = (struct commit *) o;

1966
	o = deref_tag(parse_object(new_oid->hash), NULL, 0);
1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988
	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;
}

1989
/*
1990
 * Compare a branch with its upstream, and save their differences (number
1991 1992 1993
 * 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.
1994
 *
1995 1996
 * 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.
1997
 */
1998 1999
int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs,
		       const char **upstream_name)
2000
{
2001
	struct object_id oid;
2002 2003
	struct commit *ours, *theirs;
	struct rev_info revs;
2004 2005
	const char *base;
	struct argv_array argv = ARGV_ARRAY_INIT;
2006

2007
	/* Cannot stat unless we are marked to build on top of somebody else. */
2008
	base = branch_get_upstream(branch, NULL);
2009 2010
	if (upstream_name)
		*upstream_name = base;
2011
	if (!base)
2012
		return -1;
2013

2014
	/* Cannot stat if what we used to build on no longer exists */
2015
	if (read_ref(base, oid.hash))
2016
		return -1;
2017
	theirs = lookup_commit_reference(oid.hash);
2018
	if (!theirs)
2019
		return -1;
2020

2021
	if (read_ref(branch->refname, oid.hash))
2022
		return -1;
2023
	ours = lookup_commit_reference(oid.hash);
2024
	if (!ours)
2025
		return -1;
2026 2027

	/* are we the same? */
2028 2029
	if (theirs == ours) {
		*num_theirs = *num_ours = 0;
2030
		return 0;
2031
	}
2032

2033
	/* Run "rev-list --left-right ours...theirs" internally... */
2034 2035 2036
	argv_array_push(&argv, ""); /* ignored */
	argv_array_push(&argv, "--left-right");
	argv_array_pushf(&argv, "%s...%s",
2037 2038
			 oid_to_hex(&ours->object.oid),
			 oid_to_hex(&theirs->object.oid));
2039
	argv_array_push(&argv, "--");
2040 2041

	init_revisions(&revs, NULL);
2042
	setup_revisions(argv.argc, argv.argv, &revs, NULL);
2043 2044
	if (prepare_revision_walk(&revs))
		die("revision walk setup failed");
2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057

	/* ... 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)++;
	}
2058 2059 2060 2061

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

	argv_array_clear(&argv);
2064
	return 0;
2065 2066 2067 2068 2069 2070 2071
}

/*
 * Return true when there is anything to report, otherwise false.
 */
int format_tracking_info(struct branch *branch, struct strbuf *sb)
{
2072
	int ours, theirs;
2073
	const char *full_base;
2074
	char *base;
2075
	int upstream_is_gone = 0;
2076

2077 2078 2079
	if (stat_tracking_info(branch, &ours, &theirs, &full_base) < 0) {
		if (!full_base)
			return 0;
2080 2081
		upstream_is_gone = 1;
	}
2082

2083
	base = shorten_unambiguous_ref(full_base, 0);
2084 2085 2086 2087 2088 2089 2090
	if (upstream_is_gone) {
		strbuf_addf(sb,
			_("Your branch is based on '%s', but the upstream is gone.\n"),
			base);
		if (advice_status_hints)
			strbuf_addf(sb,
				_("  (use \"git branch --unset-upstream\" to fixup)\n"));
2091 2092 2093 2094
	} else if (!ours && !theirs) {
		strbuf_addf(sb,
			_("Your branch is up-to-date with '%s'.\n"),
			base);
2095
	} else if (!theirs) {
2096 2097 2098
		strbuf_addf(sb,
			Q_("Your branch is ahead of '%s' by %d commit.\n",
			   "Your branch is ahead of '%s' by %d commits.\n",
2099 2100
			   ours),
			base, ours);
2101 2102 2103
		if (advice_status_hints)
			strbuf_addf(sb,
				_("  (use \"git push\" to publish your local commits)\n"));
2104
	} else if (!ours) {
2105 2106 2107 2108 2109
		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",
2110 2111
			   theirs),
			base, theirs);
2112 2113 2114
		if (advice_status_hints)
			strbuf_addf(sb,
				_("  (use \"git pull\" to update your local branch)\n"));
2115
	} else {
2116 2117 2118 2119 2120 2121 2122
		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",
2123 2124
			   theirs),
			base, ours, theirs);
2125 2126 2127
		if (advice_status_hints)
			strbuf_addf(sb,
				_("  (use \"git pull\" to merge the remote branch into yours)\n"));
2128
	}
2129
	free(base);
2130 2131
	return 1;
}
2132

2133 2134
static int one_local_ref(const char *refname, const struct object_id *oid,
			 int flag, void *cb_data)
2135 2136 2137 2138 2139 2140
{
	struct ref ***local_tail = cb_data;
	struct ref *ref;
	int len;

	/* we already know it starts with refs/ to get here */
2141
	if (check_refname_format(refname + 5, 0))
2142 2143 2144 2145
		return 0;

	len = strlen(refname) + 1;
	ref = xcalloc(1, sizeof(*ref) + len);
2146
	oidcpy(&ref->new_oid, oid);
2147 2148 2149 2150 2151 2152 2153 2154
	memcpy(ref->name, refname, len);
	**local_tail = ref;
	*local_tail = &ref->next;
	return 0;
}

struct ref *get_local_heads(void)
{
2155
	struct ref *local_refs = NULL, **local_tail = &local_refs;
2156

2157 2158 2159
	for_each_ref(one_local_ref, &local_tail);
	return local_refs;
}
J
Jay Soffian 已提交
2160

2161 2162 2163
struct ref *guess_remote_head(const struct ref *head,
			      const struct ref *refs,
			      int all)
J
Jay Soffian 已提交
2164 2165
{
	const struct ref *r;
2166 2167
	struct ref *list = NULL;
	struct ref **tail = &list;
J
Jay Soffian 已提交
2168

2169
	if (!head)
J
Jay Soffian 已提交
2170 2171
		return NULL;

2172 2173 2174 2175 2176 2177 2178 2179
	/*
	 * 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 已提交
2180
	/* If refs/heads/master could be right, it is. */
2181 2182
	if (!all) {
		r = find_ref_by_name(refs, "refs/heads/master");
2183
		if (r && !oidcmp(&r->old_oid, &head->old_oid))
2184 2185
			return copy_ref(r);
	}
J
Jay Soffian 已提交
2186 2187

	/* Look for another ref that points there */
2188
	for (r = refs; r; r = r->next) {
2189
		if (r != head &&
2190
		    starts_with(r->name, "refs/heads/") &&
2191
		    !oidcmp(&r->old_oid, &head->old_oid)) {
2192 2193 2194 2195 2196 2197
			*tail = copy_ref(r);
			tail = &((*tail)->next);
			if (!all)
				break;
		}
	}
J
Jay Soffian 已提交
2198

2199
	return list;
J
Jay Soffian 已提交
2200
}
2201 2202 2203 2204

struct stale_heads_info {
	struct string_list *ref_names;
	struct ref **stale_refs_tail;
2205 2206
	struct refspec *refs;
	int ref_count;
2207 2208
};

2209 2210
static int get_stale_heads_cb(const char *refname, const struct object_id *oid,
			      int flags, void *cb_data)
2211 2212
{
	struct stale_heads_info *info = cb_data;
2213
	struct string_list matches = STRING_LIST_INIT_DUP;
2214
	struct refspec query;
2215
	int i, stale = 1;
2216 2217 2218
	memset(&query, 0, sizeof(struct refspec));
	query.dst = (char *)refname;

2219 2220 2221
	query_refspecs_multiple(info->refs, info->ref_count, &query, &matches);
	if (matches.nr == 0)
		goto clean_exit; /* No matches */
2222 2223 2224 2225

	/*
	 * 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
2226 2227 2228
	 * remote, we consider it to be stale. In order to deal with
	 * overlapping refspecs, we need to go over all of the
	 * matching refs.
2229
	 */
2230 2231 2232 2233 2234 2235 2236 2237
	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) {
2238
		struct ref *ref = make_linked_ref(refname, &info->stale_refs_tail);
2239
		oidcpy(&ref->new_oid, oid);
2240
	}
2241

2242 2243
clean_exit:
	string_list_clear(&matches, 0);
2244 2245 2246
	return 0;
}

2247
struct ref *get_stale_heads(struct refspec *refs, int ref_count, struct ref *fetch_map)
2248 2249
{
	struct ref *ref, *stale_refs = NULL;
2250
	struct string_list ref_names = STRING_LIST_INIT_NODUP;
2251
	struct stale_heads_info info;
2252

2253 2254
	info.ref_names = &ref_names;
	info.stale_refs_tail = &stale_refs;
2255 2256
	info.refs = refs;
	info.ref_count = ref_count;
2257
	for (ref = fetch_map; ref; ref = ref->next)
2258
		string_list_append(&ref_names, ref->name);
2259
	string_list_sort(&ref_names);
2260 2261 2262 2263
	for_each_ref(get_stale_heads_cb, &info);
	string_list_clear(&ref_names, 0);
	return stale_refs;
}
2264 2265 2266 2267

/*
 * Compare-and-swap
 */
2268
static void clear_cas_option(struct push_cas_option *cas)
2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 2295 2296 2297 2298 2299 2300 2301 2302 2303 2304 2305 2306 2307 2308 2309 2310 2311 2312 2313 2314 2315 2316 2317 2318 2319 2320
{
	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;
}

int parse_push_cas_option(struct push_cas_option *cas, const char *arg, int unset)
{
	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;
	else if (get_sha1(colon + 1, entry->expect))
		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);
}
2321 2322 2323 2324 2325 2326 2327 2328 2329 2330 2331 2332 2333

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,
2334
			   struct object_id *oid)
2335 2336 2337 2338 2339 2340
{
	char *dst;

	dst = apply_refspecs(remote->fetch, remote->fetch_refspec_nr, refname);
	if (!dst)
		return -1; /* no tracking ref for refname at remote */
2341
	if (read_ref(dst, oid->hash))
2342 2343 2344 2345 2346 2347 2348 2349 2350 2351 2352 2353 2354
		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];
2355
		if (!refname_match(entry->refname, ref->name))
2356 2357 2358
			continue;
		ref->expect_old_sha1 = 1;
		if (!entry->use_tracking)
2359
			hashcpy(ref->old_oid_expect.hash, cas->entry[i].expect);
2360
		else if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
2361 2362 2363 2364 2365 2366 2367 2368 2369
			ref->expect_old_no_trackback = 1;
		return;
	}

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

	ref->expect_old_sha1 = 1;
2370
	if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
2371 2372 2373 2374 2375 2376 2377 2378 2379 2380 2381
		ref->expect_old_no_trackback = 1;
}

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);
}