remote.c 56.2 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

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

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

const struct refspec *tag_refspec = &s_tag_refspec;

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

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

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

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

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

58 59 60
#define BUF_SIZE (2048)
static char buffer[BUF_SIZE];

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

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

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

90
	ret = xmalloc(r->rewrite[longest_i]->baselen +
91
		     (strlen(url) - longest->len) + 1);
92 93
	strcpy(ret, r->rewrite[longest_i]->base);
	strcpy(ret + r->rewrite[longest_i]->baselen, url + longest->len);
94
	return ret;
95 96
}

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

105 106
static void add_fetch_refspec(struct remote *remote, const char *ref)
{
D
Daniel Barkalow 已提交
107 108 109 110
	ALLOC_GROW(remote->fetch_refspec,
		   remote->fetch_refspec_nr + 1,
		   remote->fetch_refspec_alloc);
	remote->fetch_refspec[remote->fetch_refspec_nr++] = ref;
111 112
}

113
static void add_url(struct remote *remote, const char *url)
114
{
D
Daniel Barkalow 已提交
115 116
	ALLOC_GROW(remote->url, remote->url_nr + 1, remote->url_alloc);
	remote->url[remote->url_nr++] = url;
117 118
}

119 120 121 122 123 124
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;
}

125 126 127 128 129 130 131 132 133 134 135 136 137
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);
}

138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156
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);
}

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

163 164 165 166 167 168 169 170 171 172
	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;
173

D
Daniel Barkalow 已提交
174
	ret = xcalloc(1, sizeof(struct remote));
175
	ret->prune = -1;  /* unspecified */
D
Daniel Barkalow 已提交
176 177
	ALLOC_GROW(remotes, remotes_nr + 1, remotes_alloc);
	remotes[remotes_nr++] = ret;
178 179 180 181 182
	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 已提交
183
	return ret;
184 185
}

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

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

D
Daniel Barkalow 已提交
198 199 200 201 202
	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];
203 204
	}

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

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

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

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

230
	ALLOC_GROW(r->rewrite, r->rewrite_nr + 1, r->rewrite_alloc);
231
	ret = xcalloc(1, sizeof(struct rewrite));
232
	r->rewrite[r->rewrite_nr++] = ret;
233
	if (len) {
234
		ret->base = xstrndup(base, len);
235 236 237
		ret->baselen = len;
	}
	else {
238
		ret->base = xstrdup(base);
239 240
		ret->baselen = strlen(base);
	}
241 242 243 244 245 246
	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);
247 248 249
	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++;
250 251
}

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

	if (!f)
		return;
258
	remote->origin = REMOTE_REMOTES;
259 260 261 262
	while (fgets(buffer, BUF_SIZE, f)) {
		int value_list;
		char *s, *p;

263
		if (starts_with(buffer, "URL:")) {
264 265
			value_list = 0;
			s = buffer + 4;
266
		} else if (starts_with(buffer, "Push:")) {
267 268
			value_list = 1;
			s = buffer + 5;
269
		} else if (starts_with(buffer, "Pull:")) {
270 271
			value_list = 2;
			s = buffer + 5;
272 273 274 275 276 277 278 279 280 281 282 283 284 285
		} else
			continue;

		while (isspace(*s))
			s++;
		if (!*s)
			continue;

		p = s + strlen(s);
		while (isspace(p[-1]))
			*--p = 0;

		switch (value_list) {
		case 0:
286
			add_url_alias(remote, xstrdup(s));
287 288 289 290
			break;
		case 1:
			add_push_refspec(remote, xstrdup(s));
			break;
291 292 293
		case 2:
			add_fetch_refspec(remote, xstrdup(s));
			break;
294 295 296 297 298 299 300
		}
	}
	fclose(f);
}

static void read_branches_file(struct remote *remote)
{
301
	char *frag;
302
	struct strbuf branch = STRBUF_INIT;
303
	int n = 1000;
304 305 306 307 308 309 310 311 312 313 314 315 316 317
	FILE *f = fopen(git_path("branches/%.*s", n, remote->name), "r");
	char *s, *p;
	int len;

	if (!f)
		return;
	s = fgets(buffer, BUF_SIZE, f);
	fclose(f);
	if (!s)
		return;
	while (isspace(*s))
		s++;
	if (!*s)
		return;
318
	remote->origin = REMOTE_BRANCHES;
319 320 321 322 323 324
	p = s + strlen(s);
	while (isspace(p[-1]))
		*--p = 0;
	len = p - s;
	p = xmalloc(len + 1);
	strcpy(p, s);
325 326

	/*
327
	 * The branches file would have URL and optionally
328 329 330
	 * #branch specified.  The "master" (or specified) branch is
	 * fetched and stored in the local branch of the same name.
	 */
331 332 333
	frag = strchr(p, '#');
	if (frag) {
		*(frag++) = '\0';
334 335 336
		strbuf_addf(&branch, "refs/heads/%s", frag);
	} else
		strbuf_addstr(&branch, "refs/heads/master");
337 338

	strbuf_addf(&branch, ":refs/heads/%s", remote->name);
339
	add_url_alias(remote, p);
340
	add_fetch_refspec(remote, strbuf_detach(&branch, NULL));
341 342 343 344 345 346 347 348 349 350
	/*
	 * Cogito compatible push: push current HEAD to remote #branch
	 * (master if missing)
	 */
	strbuf_init(&branch, 0);
	strbuf_addstr(&branch, "HEAD");
	if (frag)
		strbuf_addf(&branch, ":refs/heads/%s", frag);
	else
		strbuf_addstr(&branch, ":refs/heads/master");
351
	add_push_refspec(remote, strbuf_detach(&branch, NULL));
352
	remote->fetch_tags = 1; /* always auto-follow */
353 354
}

355
static int handle_config(const char *key, const char *value, void *cb)
356 357 358 359
{
	const char *name;
	const char *subkey;
	struct remote *remote;
360
	struct branch *branch;
361
	if (starts_with(key, "branch.")) {
362 363 364 365
		name = key + 7;
		subkey = strrchr(name, '.');
		if (!subkey)
			return 0;
366
		branch = make_branch(name, subkey - name);
367
		if (!strcmp(subkey, ".remote")) {
368
			return git_config_string(&branch->remote_name, key, value);
369 370
		} else if (!strcmp(subkey, ".pushremote")) {
			if (branch == current_branch)
371
				if (git_config_string(&branch_pushremote_name, key, value))
372
					return -1;
373 374 375
		} else if (!strcmp(subkey, ".merge")) {
			if (!value)
				return config_error_nonbool(key);
376
			add_merge(branch, xstrdup(value));
377
		}
378
		return 0;
379
	}
380
	if (starts_with(key, "url.")) {
381
		struct rewrite *rewrite;
382
		name = key + 4;
383 384 385 386
		subkey = strrchr(name, '.');
		if (!subkey)
			return 0;
		if (!strcmp(subkey, ".insteadof")) {
387 388 389 390 391 392
			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);
393 394 395 396 397
			if (!value)
				return config_error_nonbool(key);
			add_instead_of(rewrite, xstrdup(value));
		}
	}
398

399
	if (!starts_with(key,  "remote."))
400 401
		return 0;
	name = key + 7;
402 403 404 405 406 407

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

	/* Handle remote.<name>.* variables */
408 409 410 411 412
	if (*name == '/') {
		warning("Config remote shorthand cannot begin with '/': %s",
			name);
		return 0;
	}
413 414
	subkey = strrchr(name, '.');
	if (!subkey)
415
		return 0;
416
	remote = make_remote(name, subkey - name);
417
	remote->origin = REMOTE_CONFIG;
418 419 420 421
	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);
422 423
	else if (!strcmp(subkey, ".skipfetchall"))
		remote->skip_default_update = git_config_bool(key, value);
424 425
	else if (!strcmp(subkey, ".prune"))
		remote->prune = git_config_bool(key, value);
426 427 428 429 430
	else if (!strcmp(subkey, ".url")) {
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
		add_url(remote, v);
431 432 433 434 435
	} else if (!strcmp(subkey, ".pushurl")) {
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
		add_pushurl(remote, v);
436
	} else if (!strcmp(subkey, ".push")) {
437 438 439 440
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
		add_push_refspec(remote, v);
441
	} else if (!strcmp(subkey, ".fetch")) {
442 443 444 445
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
		add_fetch_refspec(remote, v);
446
	} else if (!strcmp(subkey, ".receivepack")) {
447 448 449
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
450
		if (!remote->receivepack)
451
			remote->receivepack = v;
452 453
		else
			error("more than one receivepack given, using the first");
454
	} else if (!strcmp(subkey, ".uploadpack")) {
455 456 457
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
458
		if (!remote->uploadpack)
459
			remote->uploadpack = v;
460 461
		else
			error("more than one uploadpack given, using the first");
462 463 464
	} else if (!strcmp(subkey, ".tagopt")) {
		if (!strcmp(value, "--no-tags"))
			remote->fetch_tags = -1;
465 466
		else if (!strcmp(value, "--tags"))
			remote->fetch_tags = 2;
S
Sam Vilain 已提交
467
	} else if (!strcmp(subkey, ".proxy")) {
468 469
		return git_config_string((const char **)&remote->http_proxy,
					 key, value);
470 471
	} else if (!strcmp(subkey, ".vcs")) {
		return git_config_string(&remote->foreign_vcs, key, value);
472
	}
473 474 475
	return 0;
}

476 477 478 479
static void alias_all_urls(void)
{
	int i, j;
	for (i = 0; i < remotes_nr; i++) {
480
		int add_pushurl_aliases;
481 482
		if (!remotes[i])
			continue;
483
		for (j = 0; j < remotes[i]->pushurl_nr; j++) {
484
			remotes[i]->pushurl[j] = alias_url(remotes[i]->pushurl[j], &rewrites);
485
		}
486 487 488 489 490 491
		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);
		}
492 493 494
	}
}

495 496
static void read_config(void)
{
497
	static int loaded;
498 499 500
	unsigned char sha1[20];
	const char *head_ref;
	int flag;
501 502

	if (loaded)
503
		return;
504 505
	loaded = 1;

506
	current_branch = NULL;
507
	head_ref = resolve_ref_unsafe("HEAD", 0, sha1, &flag);
508
	if (head_ref && (flag & REF_ISSYMREF) &&
509 510
	    skip_prefix(head_ref, "refs/heads/", &head_ref)) {
		current_branch = make_branch(head_ref, 0);
511
	}
512
	git_config(handle_config, NULL);
513 514 515 516
	if (branch_pushremote_name) {
		free((char *)pushremote_name);
		pushremote_name = branch_pushremote_name;
	}
517
	alias_all_urls();
518 519
}

520 521 522 523 524 525
/*
 * 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.
 */
526
static void free_refspecs(struct refspec *refspec, int nr_refspec)
527 528 529 530 531 532 533 534 535 536 537 538 539
{
	int i;

	if (!refspec)
		return;

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

540
static struct refspec *parse_refspec_internal(int nr_refspec, const char **refspec, int fetch, int verify)
541 542
{
	int i;
543
	struct refspec *rs = xcalloc(nr_refspec, sizeof(*rs));
544

545
	for (i = 0; i < nr_refspec; i++) {
546
		size_t llen;
547 548
		int is_glob;
		const char *lhs, *rhs;
549
		int flags;
550

B
Benjamin Kramer 已提交
551
		is_glob = 0;
552 553 554

		lhs = refspec[i];
		if (*lhs == '+') {
555
			rs[i].force = 1;
556
			lhs++;
557
		}
558 559

		rhs = strrchr(lhs, ':');
560 561 562

		/*
		 * Before going on, special case ":" (or "+:") as a refspec
563
		 * for pushing matching refs.
564 565 566 567 568 569
		 */
		if (!fetch && rhs == lhs && rhs[1] == '\0') {
			rs[i].matching = 1;
			continue;
		}

570
		if (rhs) {
571
			size_t rlen = strlen(++rhs);
572
			is_glob = (1 <= rlen && strchr(rhs, '*'));
D
Daniel Barkalow 已提交
573
			rs[i].dst = xstrndup(rhs, rlen);
574
		}
D
Daniel Barkalow 已提交
575

576
		llen = (rhs ? (rhs - lhs - 1) : strlen(lhs));
577
		if (1 <= llen && memchr(lhs, '*', llen)) {
578 579 580 581 582
			if ((rhs && !is_glob) || (!rhs && fetch))
				goto invalid;
			is_glob = 1;
		} else if (rhs && is_glob) {
			goto invalid;
D
Daniel Barkalow 已提交
583
		}
584

585 586
		rs[i].pattern = is_glob;
		rs[i].src = xstrndup(lhs, llen);
587
		flags = REFNAME_ALLOW_ONELEVEL | (is_glob ? REFNAME_REFSPEC_PATTERN : 0);
588 589

		if (fetch) {
590 591
			unsigned char unused[40];

592
			/* LHS */
593
			if (!*rs[i].src)
594
				; /* empty is ok; it means "HEAD" */
595 596
			else if (llen == 40 && !get_sha1_hex(rs[i].src, unused))
				rs[i].exact_sha1 = 1; /* ok */
597 598 599
			else if (!check_refname_format(rs[i].src, flags))
				; /* valid looking ref is ok */
			else
600
				goto invalid;
601
			/* RHS */
602
			if (!rs[i].dst)
603
				; /* missing is ok; it is the same as empty */
604
			else if (!*rs[i].dst)
605 606 607 608
				; /* empty is ok; it means "do not store" */
			else if (!check_refname_format(rs[i].dst, flags))
				; /* valid looking ref is ok */
			else
609
				goto invalid;
610 611 612 613 614 615 616 617 618 619 620
		} 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) {
621
				if (check_refname_format(rs[i].src, flags))
622 623 624 625 626 627 628 629 630 631 632 633
					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) {
634
				if (check_refname_format(rs[i].src, flags))
635 636 637 638
					goto invalid;
			} else if (!*rs[i].dst) {
				goto invalid;
			} else {
639
				if (check_refname_format(rs[i].dst, flags))
640 641
					goto invalid;
			}
D
Daniel Barkalow 已提交
642
		}
643 644
	}
	return rs;
645 646

 invalid:
647
	if (verify) {
648 649 650 651 652 653
		/*
		 * 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);
654 655
		return NULL;
	}
656 657 658
	die("Invalid refspec '%s'", refspec[i]);
}

659 660 661 662
int valid_fetch_refspec(const char *fetch_refspec_str)
{
	struct refspec *refspec;

663
	refspec = parse_refspec_internal(1, &fetch_refspec_str, 1, 1);
664
	free_refspecs(refspec, 1);
665 666 667
	return !!refspec;
}

668 669
struct refspec *parse_fetch_refspec(int nr_refspec, const char **refspec)
{
670
	return parse_refspec_internal(nr_refspec, refspec, 1, 0);
671 672
}

673
static struct refspec *parse_push_refspec(int nr_refspec, const char **refspec)
674
{
675
	return parse_refspec_internal(nr_refspec, refspec, 0, 0);
676 677
}

678 679 680 681 682 683 684 685 686 687
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);
}

688 689
static int valid_remote_nick(const char *name)
{
690
	if (!name[0] || is_dot_or_dotdot(name))
691 692 693 694
		return 0;
	return !strchr(name, '/'); /* no slash */
}

695 696 697 698 699 700 701 702 703 704 705 706
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";
}

707
static struct remote *remote_get_1(const char *name, const char *pushremote_name)
708 709
{
	struct remote *ret;
710
	int name_given = 0;
711

712 713 714
	if (name)
		name_given = 1;
	else {
715 716 717
		if (pushremote_name) {
			name = pushremote_name;
			name_given = 1;
718 719
		} else
			name = remote_for_branch(current_branch, &name_given);
720
	}
721

722
	ret = make_remote(name, 0);
723
	if (valid_remote_nick(name)) {
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 740 741 742 743 744 745 746 747 748 749
struct remote *remote_get(const char *name)
{
	read_config();
	return remote_get_1(name, NULL);
}

struct remote *pushremote_get(const char *name)
{
	read_config();
	return remote_get_1(name, pushremote_name);
}

750 751
int remote_is_configured(const char *name)
{
752 753
	struct remotes_hash_key lookup;
	struct hashmap_entry lookup_entry;
754 755
	read_config();

756 757 758 759 760 761
	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;
762 763
}

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

783 784
static void handle_duplicate(struct ref *ref1, struct ref *ref2)
{
785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806
	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"));
		}
	}
807 808 809 810
	free(ref2->peer_ref);
	free(ref2);
}

811
struct ref *ref_remove_duplicates(struct ref *ref_map)
812
{
813
	struct string_list refs = STRING_LIST_INIT_NODUP;
814 815
	struct ref *retval = NULL;
	struct ref **p = &retval;
816

817 818 819 820 821
	while (ref_map) {
		struct ref *ref = ref_map;

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

823 824 825
		if (!ref->peer_ref) {
			*p = ref;
			p = &ref->next;
826
		} else {
827 828 829 830 831
			struct string_list_item *item =
				string_list_insert(&refs, ref->peer_ref->name);

			if (item->util) {
				/* Entry already existed */
832
				handle_duplicate((struct ref *)item->util, ref);
833 834 835 836 837
			} else {
				*p = ref;
				p = &ref->next;
				item->util = ref;
			}
838 839
		}
	}
840

841
	string_list_clear(&refs, 0);
842
	return retval;
843 844
}

845
int remote_has_url(struct remote *remote, const char *url)
846 847
{
	int i;
848 849
	for (i = 0; i < remote->url_nr; i++) {
		if (!strcmp(remote->url[i], url))
850 851 852 853 854
			return 1;
	}
	return 0;
}

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

883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908
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);
		}
	}
}

909
int query_refspecs(struct refspec *refs, int ref_count, struct refspec *query)
910 911
{
	int i;
912
	int find_src = !query->src;
913 914
	const char *needle = find_src ? query->dst : query->src;
	char **result = find_src ? &query->src : &query->dst;
915

916 917
	if (find_src && !query->dst)
		return error("query_refspecs: need either src or dst");
918

919 920 921 922
	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;
923

924
		if (!refspec->dst)
925
			continue;
926
		if (refspec->pattern) {
927
			if (match_name_with_pattern(key, needle, value, result)) {
928
				query->force = refspec->force;
929 930
				return 0;
			}
931 932
		} else if (!strcmp(needle, key)) {
			*result = xstrdup(value);
933
			query->force = refspec->force;
934
			return 0;
935 936 937 938 939
		}
	}
	return -1;
}

940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958
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 已提交
959 960 961 962 963 964 965 966 967 968
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;
}

969
struct ref *alloc_ref(const char *name)
970
{
971
	return alloc_ref_with_prefix("", 0, name);
972 973
}

J
Jeff King 已提交
974
struct ref *copy_ref(const struct ref *ref)
975
{
976 977 978 979 980 981 982 983
	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;
984 985
	cpy->symref = xstrdup_or_null(ref->symref);
	cpy->remote_status = xstrdup_or_null(ref->remote_status);
986 987
	cpy->peer_ref = copy_ref(ref->peer_ref);
	return cpy;
988 989
}

990 991 992 993 994 995 996 997 998 999 1000 1001
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;
}

1002
static void free_ref(struct ref *ref)
1003 1004 1005
{
	if (!ref)
		return;
1006
	free_ref(ref->peer_ref);
1007 1008 1009 1010 1011
	free(ref->remote_status);
	free(ref->symref);
	free(ref);
}

1012 1013 1014 1015 1016
void free_refs(struct ref *ref)
{
	struct ref *next;
	while (ref) {
		next = ref->next;
1017
		free_ref(ref);
1018 1019 1020 1021
		ref = next;
	}
}

1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042
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);
}

1043 1044 1045
int count_refspec_match(const char *pattern,
			struct ref *refs,
			struct ref **matched_ref)
1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056
{
	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);

1057
		if (!refname_match(pattern, name))
1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069
			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 &&
1070 1071
		    !starts_with(name, "refs/heads/") &&
		    !starts_with(name, "refs/tags/")) {
1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087
			/* 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) {
1088 1089
		if (matched_ref)
			*matched_ref = matched_weak;
1090 1091 1092
		return weak_match;
	}
	else {
1093 1094
		if (matched_ref)
			*matched_ref = matched;
1095 1096 1097 1098
		return match;
	}
}

1099
static void tail_link_ref(struct ref *ref, struct ref ***tail)
1100 1101
{
	**tail = ref;
1102 1103
	while (ref->next)
		ref = ref->next;
1104 1105 1106
	*tail = &ref->next;
}

1107 1108 1109 1110 1111 1112 1113
static struct ref *alloc_delete_ref(void)
{
	struct ref *ref = alloc_ref("(delete)");
	hashclr(ref->new_sha1);
	return ref;
}

1114 1115
static int try_explicit_object_name(const char *name,
				    struct ref **match)
1116 1117 1118
{
	unsigned char sha1[20];

1119 1120 1121 1122 1123 1124
	if (!*name) {
		if (match)
			*match = alloc_delete_ref();
		return 0;
	}

1125
	if (get_sha1(name, sha1))
1126 1127 1128 1129 1130 1131 1132
		return -1;

	if (match) {
		*match = alloc_ref(name);
		hashcpy((*match)->new_sha1, sha1);
	}
	return 0;
1133 1134
}

1135
static struct ref *make_linked_ref(const char *name, struct ref ***tail)
1136
{
1137
	struct ref *ret = alloc_ref(name);
1138 1139
	tail_link_ref(ret, tail);
	return ret;
1140
}
1141

1142 1143 1144 1145 1146
static char *guess_ref(const char *name, struct ref *peer)
{
	struct strbuf buf = STRBUF_INIT;
	unsigned char sha1[20];

1147 1148
	const char *r = resolve_ref_unsafe(peer->name, RESOLVE_REF_READING,
					   sha1, NULL);
1149 1150 1151
	if (!r)
		return NULL;

1152
	if (starts_with(r, "refs/heads/"))
1153
		strbuf_addstr(&buf, "refs/heads/");
1154
	else if (starts_with(r, "refs/tags/"))
1155 1156 1157 1158 1159 1160 1161 1162
		strbuf_addstr(&buf, "refs/tags/");
	else
		return NULL;

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

1163 1164 1165 1166 1167 1168 1169
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:
1170 1171
		if (allocated_match)
			*allocated_match = 0;
1172 1173 1174 1175 1176 1177
		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.
		 */
1178
		if (try_explicit_object_name(rs->src, match) < 0)
1179
			return error("src refspec %s does not match any.", rs->src);
1180 1181
		if (allocated_match)
			*allocated_match = 1;
1182 1183 1184 1185 1186 1187
		return 0;
	default:
		return error("src refspec %s matches more than one.", rs->src);
	}
}

1188 1189
static int match_explicit(struct ref *src, struct ref *dst,
			  struct ref ***dst_tail,
1190
			  struct refspec *rs)
1191
{
1192
	struct ref *matched_src, *matched_dst;
1193
	int allocated_src;
1194

1195
	const char *dst_value = rs->dst;
1196
	char *dst_guess;
1197

1198
	if (rs->pattern || rs->matching)
1199
		return 0;
1200

1201
	matched_src = matched_dst = NULL;
1202 1203
	if (match_explicit_lhs(src, rs, &matched_src, &allocated_src) < 0)
		return -1;
1204

1205
	if (!dst_value) {
1206 1207 1208
		unsigned char sha1[20];
		int flag;

1209 1210 1211
		dst_value = resolve_ref_unsafe(matched_src->name,
					       RESOLVE_REF_READING,
					       sha1, &flag);
1212 1213
		if (!dst_value ||
		    ((flag & REF_ISSYMREF) &&
1214
		     !starts_with(dst_value, "refs/heads/")))
1215 1216
			die("%s cannot be resolved to branch.",
			    matched_src->name);
1217
	}
1218

1219 1220 1221 1222
	switch (count_refspec_match(dst_value, dst, &matched_dst)) {
	case 1:
		break;
	case 0:
1223
		if (starts_with(dst_value, "refs/"))
1224
			matched_dst = make_linked_ref(dst_value, dst_tail);
1225 1226 1227
		else if (is_null_sha1(matched_src->new_sha1))
			error("unable to delete '%s': remote ref does not exist",
			      dst_value);
1228
		else if ((dst_guess = guess_ref(dst_value, matched_src)))
1229
			matched_dst = make_linked_ref(dst_guess, dst_tail);
1230
		else
1231 1232 1233 1234 1235 1236
			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);
1237 1238
		break;
	default:
1239
		matched_dst = NULL;
1240 1241 1242 1243
		error("dst refspec %s matches more than one.",
		      dst_value);
		break;
	}
1244 1245 1246 1247
	if (!matched_dst)
		return -1;
	if (matched_dst->peer_ref)
		return error("dst ref %s receives from more than one src.",
1248 1249
		      matched_dst->name);
	else {
1250 1251 1252
		matched_dst->peer_ref = allocated_src ?
					matched_src :
					copy_ref(matched_src);
1253
		matched_dst->force = rs->force;
1254
	}
1255
	return 0;
1256 1257 1258 1259 1260 1261 1262 1263
}

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++)
1264 1265
		errs += match_explicit(src, dst, dst_tail, &rs[i]);
	return errs;
1266 1267
}

1268
static char *get_ref_match(const struct refspec *rs, int rs_nr, const struct ref *ref,
F
Felipe Contreras 已提交
1269
		int send_mirror, int direction, const struct refspec **ret_pat)
1270
{
1271 1272
	const struct refspec *pat;
	char *name;
1273
	int i;
1274
	int matching_refs = -1;
1275
	for (i = 0; i < rs_nr; i++) {
1276 1277 1278 1279 1280 1281
		if (rs[i].matching &&
		    (matching_refs == -1 || rs[i].force)) {
			matching_refs = i;
			continue;
		}

1282 1283
		if (rs[i].pattern) {
			const char *dst_side = rs[i].dst ? rs[i].dst : rs[i].src;
F
Felipe Contreras 已提交
1284 1285 1286 1287 1288 1289
			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) {
1290 1291 1292 1293
				matching_refs = i;
				break;
			}
		}
1294
	}
1295
	if (matching_refs == -1)
1296
		return NULL;
1297 1298 1299 1300 1301 1302 1303 1304

	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.
		 */
1305
		if (!send_mirror && !starts_with(ref->name, "refs/heads/"))
1306 1307 1308 1309 1310 1311
			return NULL;
		name = xstrdup(ref->name);
	}
	if (ret_pat)
		*ret_pat = pat;
	return name;
1312 1313
}

1314 1315 1316 1317 1318 1319 1320 1321
static struct ref **tail_ref(struct ref **head)
{
	struct ref **tail = head;
	while (*tail)
		tail = &((*tail)->next);
	return tail;
}

J
Junio C Hamano 已提交
1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359
struct tips {
	struct commit **tip;
	int nr, alloc;
};

static void add_to_tips(struct tips *tips, const unsigned char *sha1)
{
	struct commit *commit;

	if (is_null_sha1(sha1))
		return;
	commit = lookup_commit_reference_gently(sha1, 1);
	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 &&
		    !is_null_sha1(ref->peer_ref->new_sha1))
			add_to_tips(&sent_tips, ref->peer_ref->new_sha1);
		else
			add_to_tips(&sent_tips, ref->old_sha1);
1360
		if (starts_with(ref->name, "refs/tags/"))
J
Junio C Hamano 已提交
1361 1362 1363 1364
			string_list_append(&dst_tag, ref->name);
	}
	clear_commit_marks_many(sent_tips.nr, sent_tips.tip, TMP_MARK);

1365
	string_list_sort(&dst_tag);
J
Junio C Hamano 已提交
1366 1367 1368

	/* Collect tags they do not have. */
	for (ref = src; ref; ref = ref->next) {
1369
		if (!starts_with(ref->name, "refs/tags/"))
J
Junio C Hamano 已提交
1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416
			continue; /* not a tag */
		if (string_list_has_string(&dst_tag, ref->name))
			continue; /* they already have it */
		if (sha1_object_info(ref->new_sha1, NULL) != OBJ_TAG)
			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;

			if (is_null_sha1(ref->new_sha1))
				continue;
			commit = lookup_commit_reference_gently(ref->new_sha1, 1);
			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);
			hashcpy(dst_ref->new_sha1, ref->new_sha1);
			dst_ref->peer_ref = copy_ref(ref);
		}
	}
	string_list_clear(&src_tag, 0);
	free(sent_tips.tip);
}

1417 1418 1419 1420 1421 1422 1423 1424
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;
}

1425 1426 1427 1428 1429
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;

1430
	string_list_sort(ref_index);
1431 1432
}

1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457
/*
 * 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;
}

1458
/*
1459 1460 1461 1462 1463 1464
 * 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).
1465
 */
1466 1467
int match_push_refs(struct ref *src, struct ref **dst,
		    int nr_refspec, const char **refspec, int flags)
1468
{
1469
	struct refspec *rs;
A
Andy Whitcroft 已提交
1470 1471
	int send_all = flags & MATCH_REFS_ALL;
	int send_mirror = flags & MATCH_REFS_MIRROR;
F
Felipe Contreras 已提交
1472
	int send_prune = flags & MATCH_REFS_PRUNE;
1473
	int errs;
1474
	static const char *default_refspec[] = { ":", NULL };
1475
	struct ref *ref, **dst_tail = tail_ref(dst);
1476
	struct string_list dst_ref_index = STRING_LIST_INIT_NODUP;
1477

1478 1479 1480 1481 1482
	if (!nr_refspec) {
		nr_refspec = 1;
		refspec = default_refspec;
	}
	rs = parse_push_refspec(nr_refspec, (const char **) refspec);
1483
	errs = match_explicit_refs(src, *dst, &dst_tail, rs, nr_refspec);
1484 1485

	/* pick the remainder */
1486
	for (ref = src; ref; ref = ref->next) {
1487
		struct string_list_item *dst_item;
1488
		struct ref *dst_peer;
1489 1490
		const struct refspec *pat = NULL;
		char *dst_name;
1491

F
Felipe Contreras 已提交
1492
		dst_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_SRC, &pat);
1493
		if (!dst_name)
1494 1495
			continue;

1496 1497 1498 1499 1500
		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;
1501 1502 1503 1504 1505 1506 1507 1508 1509
		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 已提交
1510
				 * --all or --mirror.
1511 1512
				 */
				goto free_name;
A
Andy Whitcroft 已提交
1513

1514
			/* Create a new one and link it */
1515
			dst_peer = make_linked_ref(dst_name, &dst_tail);
1516
			hashcpy(dst_peer->new_sha1, ref->new_sha1);
1517 1518
			string_list_insert(&dst_ref_index,
				dst_peer->name)->util = dst_peer;
1519
		}
1520
		dst_peer->peer_ref = copy_ref(ref);
1521
		dst_peer->force = pat->force;
1522 1523
	free_name:
		free(dst_name);
1524
	}
J
Junio C Hamano 已提交
1525

1526 1527
	string_list_clear(&dst_ref_index, 0);

J
Junio C Hamano 已提交
1528 1529 1530
	if (flags & MATCH_REFS_FOLLOW_TAGS)
		add_missing_tags(src, dst, &dst_tail);

F
Felipe Contreras 已提交
1531
	if (send_prune) {
1532
		struct string_list src_ref_index = STRING_LIST_INIT_NODUP;
F
Felipe Contreras 已提交
1533 1534 1535 1536 1537 1538 1539 1540 1541 1542
		/* 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) {
1543 1544 1545 1546
				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 已提交
1547 1548 1549 1550
					ref->peer_ref = alloc_delete_ref();
				free(src_name);
			}
		}
1551
		string_list_clear(&src_ref_index, 0);
F
Felipe Contreras 已提交
1552
	}
1553 1554
	if (errs)
		return -1;
1555 1556
	return 0;
}
1557

1558
void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
1559
			     int force_update)
1560 1561 1562 1563
{
	struct ref *ref;

	for (ref = remote_refs; ref; ref = ref->next) {
1564
		int force_ref_update = ref->force || force_update;
1565
		int reject_reason = 0;
1566

1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578
		if (ref->peer_ref)
			hashcpy(ref->new_sha1, ref->peer_ref->new_sha1);
		else if (!send_mirror)
			continue;

		ref->deletion = is_null_sha1(ref->new_sha1);
		if (!ref->deletion &&
			!hashcmp(ref->old_sha1, ref->new_sha1)) {
			ref->status = REF_STATUS_UPTODATE;
			continue;
		}

C
Chris Rorvick 已提交
1579
		/*
1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599
		 * 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 ||
			    hashcmp(ref->old_sha1, ref->old_sha1_expect))
				reject_reason = REF_STATUS_REJECT_STALE;
		}

		/*
		 * The usual "must fast-forward" rules.
		 *
1600 1601 1602
		 * Decide whether an individual refspec A:B can be
		 * pushed.  The push will succeed if any of the
		 * following are true:
1603
		 *
C
Chris Rorvick 已提交
1604
		 * (1) the remote reference B does not exist
1605
		 *
C
Chris Rorvick 已提交
1606 1607
		 * (2) the remote reference B is being removed (i.e.,
		 *     pushing :B where no source is specified)
1608
		 *
1609 1610 1611
		 * (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.
1612
		 *
C
Chris Rorvick 已提交
1613 1614
		 * (4) it is forced using the +A:B notation, or by
		 *     passing the --force argument
1615 1616
		 */

1617
		else if (!ref->deletion && !is_null_sha1(ref->old_sha1)) {
1618
			if (starts_with(ref->name, "refs/tags/"))
1619
				reject_reason = REF_STATUS_REJECT_ALREADY_EXISTS;
1620
			else if (!has_sha1_file(ref->old_sha1))
1621
				reject_reason = REF_STATUS_REJECT_FETCH_FIRST;
1622 1623
			else if (!lookup_commit_reference_gently(ref->old_sha1, 1) ||
				 !lookup_commit_reference_gently(ref->new_sha1, 1))
1624
				reject_reason = REF_STATUS_REJECT_NEEDS_FORCE;
1625
			else if (!ref_newer(ref->new_sha1, ref->old_sha1))
1626
				reject_reason = REF_STATUS_REJECT_NONFASTFORWARD;
1627
		}
1628 1629 1630 1631 1632 1633 1634 1635 1636

		/*
		 * "--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;
1637 1638 1639
	}
}

1640 1641
static void set_merge(struct branch *ret)
{
1642
	struct remote *remote;
1643 1644 1645 1646
	char *ref;
	unsigned char sha1[20];
	int i;

1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659
	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;
	}

1660 1661
	remote = remote_get(ret->remote_name);

1662 1663 1664 1665
	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]);
1666
		if (!remote_find_tracking(remote, ret->merge[i]) ||
1667 1668 1669 1670 1671 1672 1673 1674 1675 1676
		    strcmp(ret->remote_name, "."))
			continue;
		if (dwim_ref(ret->merge_name[i], strlen(ret->merge_name[i]),
			     sha1, &ref) == 1)
			ret->merge[i]->dst = ref;
		else
			ret->merge[i]->dst = xstrdup(ret->merge_name[i]);
	}
}

1677 1678 1679 1680 1681 1682 1683 1684 1685
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);
1686
	set_merge(ret);
1687 1688 1689 1690 1691 1692 1693 1694
	return ret;
}

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

1695 1696 1697
int branch_merge_matches(struct branch *branch,
		                 int i,
		                 const char *refname)
1698
{
1699
	if (!branch || i < 0 || i >= branch->merge_nr)
1700
		return 0;
1701
	return refname_match(branch->merge[i]->src, refname);
1702
}
1703

1704 1705 1706 1707 1708
static int ignore_symref_update(const char *refname)
{
	unsigned char sha1[20];
	int flag;

1709
	if (!resolve_ref_unsafe(refname, 0, sha1, &flag))
1710 1711 1712 1713
		return 0; /* non-existing refs are OK */
	return (flag & REF_ISSYMREF);
}

1714 1715 1716 1717 1718 1719 1720
/*
 * 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.
 */
1721
static struct ref *get_expanded_map(const struct ref *remote_refs,
1722 1723
				    const struct refspec *refspec)
{
1724
	const struct ref *ref;
1725 1726 1727 1728
	struct ref *ret = NULL;
	struct ref **tail = &ret;

	for (ref = remote_refs; ref; ref = ref->next) {
1729 1730
		char *expn_name = NULL;

1731 1732
		if (strchr(ref->name, '^'))
			continue; /* a dereference item */
1733
		if (match_name_with_pattern(refspec->src, ref->name,
1734 1735
					    refspec->dst, &expn_name) &&
		    !ignore_symref_update(expn_name)) {
1736 1737
			struct ref *cpy = copy_ref(ref);

1738
			cpy->peer_ref = alloc_ref(expn_name);
1739 1740 1741 1742 1743
			if (refspec->force)
				cpy->peer_ref->force = 1;
			*tail = cpy;
			tail = &cpy->next;
		}
1744
		free(expn_name);
1745 1746 1747 1748 1749
	}

	return ret;
}

1750
static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
1751
{
1752
	const struct ref *ref;
1753
	for (ref = refs; ref; ref = ref->next) {
1754
		if (refname_match(name, ref->name))
1755 1756 1757 1758 1759
			return ref;
	}
	return NULL;
}

1760
struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
1761
{
1762
	const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
1763 1764

	if (!ref)
1765
		return NULL;
1766 1767 1768 1769 1770 1771

	return copy_ref(ref);
}

static struct ref *get_local_ref(const char *name)
{
1772
	if (!name || name[0] == '\0')
1773 1774
		return NULL;

1775
	if (starts_with(name, "refs/"))
1776
		return alloc_ref(name);
1777

1778 1779 1780
	if (starts_with(name, "heads/") ||
	    starts_with(name, "tags/") ||
	    starts_with(name, "remotes/"))
R
René Scharfe 已提交
1781
		return alloc_ref_with_prefix("refs/", 5, name);
1782

R
René Scharfe 已提交
1783
	return alloc_ref_with_prefix("refs/heads/", 11, name);
1784 1785
}

1786
int get_fetch_map(const struct ref *remote_refs,
1787
		  const struct refspec *refspec,
1788 1789
		  struct ref ***tail,
		  int missing_ok)
1790
{
D
Daniel Barkalow 已提交
1791
	struct ref *ref_map, **rmp;
1792 1793 1794 1795

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

1798 1799 1800 1801 1802 1803
		if (refspec->exact_sha1) {
			ref_map = alloc_ref(name);
			get_sha1_hex(name, ref_map->old_sha1);
		} else {
			ref_map = get_remote_ref(remote_refs, name);
		}
1804 1805 1806 1807 1808 1809 1810
		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;
		}
1811 1812
	}

D
Daniel Barkalow 已提交
1813 1814
	for (rmp = &ref_map; *rmp; ) {
		if ((*rmp)->peer_ref) {
1815
			if (!starts_with((*rmp)->peer_ref->name, "refs/") ||
1816
			    check_refname_format((*rmp)->peer_ref->name, 0)) {
D
Daniel Barkalow 已提交
1817 1818 1819 1820 1821 1822 1823 1824 1825 1826
				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);
1827 1828
	}

1829 1830
	if (ref_map)
		tail_link_ref(ref_map, tail);
1831 1832 1833

	return 0;
}
1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845

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)) {
			hashcpy(ref->old_sha1, list->old_sha1);
			return 0;
		}
	return 1;
}
1846

1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863
static void unmark_and_free(struct commit_list *list, unsigned int mark)
{
	while (list) {
		struct commit_list *temp = list;
		temp->item->object.flags &= ~mark;
		list = temp->next;
		free(temp);
	}
}

int ref_newer(const unsigned char *new_sha1, const unsigned char *old_sha1)
{
	struct object *o;
	struct commit *old, *new;
	struct commit_list *list, *used;
	int found = 0;

1864 1865
	/*
	 * Both new and old must be commit-ish and new is descendant of
1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895
	 * old.  Otherwise we require --force.
	 */
	o = deref_tag(parse_object(old_sha1), NULL, 0);
	if (!o || o->type != OBJ_COMMIT)
		return 0;
	old = (struct commit *) o;

	o = deref_tag(parse_object(new_sha1), NULL, 0);
	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;
}

1896
/*
1897 1898 1899 1900 1901
 * Compare a branch with its upstream, and save their differences (number
 * of commits) in *num_ours and *num_theirs.
 *
 * Return 0 if branch has no upstream (no base), -1 if upstream is missing
 * (with "gone" base), otherwise 1 (with base).
1902 1903 1904 1905 1906 1907 1908 1909 1910 1911
 */
int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs)
{
	unsigned char sha1[20];
	struct commit *ours, *theirs;
	char symmetric[84];
	struct rev_info revs;
	const char *rev_argv[10], *base;
	int rev_argc;

1912
	/* Cannot stat unless we are marked to build on top of somebody else. */
1913 1914 1915 1916
	if (!branch ||
	    !branch->merge || !branch->merge[0] || !branch->merge[0]->dst)
		return 0;

1917
	/* Cannot stat if what we used to build on no longer exists */
1918
	base = branch->merge[0]->dst;
1919
	if (read_ref(base, sha1))
1920
		return -1;
1921
	theirs = lookup_commit_reference(sha1);
1922
	if (!theirs)
1923
		return -1;
1924

1925
	if (read_ref(branch->refname, sha1))
1926
		return -1;
1927
	ours = lookup_commit_reference(sha1);
1928
	if (!ours)
1929
		return -1;
1930 1931

	/* are we the same? */
1932 1933 1934 1935
	if (theirs == ours) {
		*num_theirs = *num_ours = 0;
		return 1;
	}
1936

1937
	/* Run "rev-list --left-right ours...theirs" internally... */
1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950
	rev_argc = 0;
	rev_argv[rev_argc++] = NULL;
	rev_argv[rev_argc++] = "--left-right";
	rev_argv[rev_argc++] = symmetric;
	rev_argv[rev_argc++] = "--";
	rev_argv[rev_argc] = NULL;

	strcpy(symmetric, sha1_to_hex(ours->object.sha1));
	strcpy(symmetric + 40, "...");
	strcpy(symmetric + 43, sha1_to_hex(theirs->object.sha1));

	init_revisions(&revs, NULL);
	setup_revisions(rev_argc, rev_argv, &revs, NULL);
1951 1952
	if (prepare_revision_walk(&revs))
		die("revision walk setup failed");
1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965

	/* ... 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)++;
	}
1966 1967 1968 1969

	/* clear object flags smudged by the above traversal */
	clear_commit_marks(ours, ALL_REV_FLAGS);
	clear_commit_marks(theirs, ALL_REV_FLAGS);
1970 1971 1972 1973 1974 1975 1976 1977
	return 1;
}

/*
 * Return true when there is anything to report, otherwise false.
 */
int format_tracking_info(struct branch *branch, struct strbuf *sb)
{
1978
	int ours, theirs;
1979
	char *base;
1980
	int upstream_is_gone = 0;
1981

1982 1983 1984
	switch (stat_tracking_info(branch, &ours, &theirs)) {
	case 0:
		/* no base */
1985
		return 0;
1986 1987 1988 1989 1990 1991 1992 1993
	case -1:
		/* with "gone" base */
		upstream_is_gone = 1;
		break;
	default:
		/* with base */
		break;
	}
1994

1995
	base = shorten_unambiguous_ref(branch->merge[0]->dst, 0);
1996 1997 1998 1999 2000 2001 2002
	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"));
2003 2004 2005 2006
	} else if (!ours && !theirs) {
		strbuf_addf(sb,
			_("Your branch is up-to-date with '%s'.\n"),
			base);
2007
	} else if (!theirs) {
2008 2009 2010
		strbuf_addf(sb,
			Q_("Your branch is ahead of '%s' by %d commit.\n",
			   "Your branch is ahead of '%s' by %d commits.\n",
2011 2012
			   ours),
			base, ours);
2013 2014 2015
		if (advice_status_hints)
			strbuf_addf(sb,
				_("  (use \"git push\" to publish your local commits)\n"));
2016
	} else if (!ours) {
2017 2018 2019 2020 2021
		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",
2022 2023
			   theirs),
			base, theirs);
2024 2025 2026
		if (advice_status_hints)
			strbuf_addf(sb,
				_("  (use \"git pull\" to update your local branch)\n"));
2027
	} else {
2028 2029 2030 2031 2032 2033 2034
		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",
2035 2036
			   theirs),
			base, ours, theirs);
2037 2038 2039
		if (advice_status_hints)
			strbuf_addf(sb,
				_("  (use \"git pull\" to merge the remote branch into yours)\n"));
2040
	}
2041
	free(base);
2042 2043
	return 1;
}
2044 2045 2046 2047 2048 2049 2050 2051

static int one_local_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
{
	struct ref ***local_tail = cb_data;
	struct ref *ref;
	int len;

	/* we already know it starts with refs/ to get here */
2052
	if (check_refname_format(refname + 5, 0))
2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065
		return 0;

	len = strlen(refname) + 1;
	ref = xcalloc(1, sizeof(*ref) + len);
	hashcpy(ref->new_sha1, sha1);
	memcpy(ref->name, refname, len);
	**local_tail = ref;
	*local_tail = &ref->next;
	return 0;
}

struct ref *get_local_heads(void)
{
2066
	struct ref *local_refs = NULL, **local_tail = &local_refs;
2067 2068 2069
	for_each_ref(one_local_ref, &local_tail);
	return local_refs;
}
J
Jay Soffian 已提交
2070

2071 2072 2073
struct ref *guess_remote_head(const struct ref *head,
			      const struct ref *refs,
			      int all)
J
Jay Soffian 已提交
2074 2075
{
	const struct ref *r;
2076 2077
	struct ref *list = NULL;
	struct ref **tail = &list;
J
Jay Soffian 已提交
2078

2079
	if (!head)
J
Jay Soffian 已提交
2080 2081
		return NULL;

2082 2083 2084 2085 2086 2087 2088 2089
	/*
	 * 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 已提交
2090
	/* If refs/heads/master could be right, it is. */
2091 2092 2093 2094 2095
	if (!all) {
		r = find_ref_by_name(refs, "refs/heads/master");
		if (r && !hashcmp(r->old_sha1, head->old_sha1))
			return copy_ref(r);
	}
J
Jay Soffian 已提交
2096 2097

	/* Look for another ref that points there */
2098
	for (r = refs; r; r = r->next) {
2099
		if (r != head &&
2100
		    starts_with(r->name, "refs/heads/") &&
2101
		    !hashcmp(r->old_sha1, head->old_sha1)) {
2102 2103 2104 2105 2106 2107
			*tail = copy_ref(r);
			tail = &((*tail)->next);
			if (!all)
				break;
		}
	}
J
Jay Soffian 已提交
2108

2109
	return list;
J
Jay Soffian 已提交
2110
}
2111 2112 2113 2114

struct stale_heads_info {
	struct string_list *ref_names;
	struct ref **stale_refs_tail;
2115 2116
	struct refspec *refs;
	int ref_count;
2117 2118 2119 2120 2121 2122
};

static int get_stale_heads_cb(const char *refname,
	const unsigned char *sha1, int flags, void *cb_data)
{
	struct stale_heads_info *info = cb_data;
2123
	struct string_list matches = STRING_LIST_INIT_DUP;
2124
	struct refspec query;
2125
	int i, stale = 1;
2126 2127 2128
	memset(&query, 0, sizeof(struct refspec));
	query.dst = (char *)refname;

2129 2130 2131
	query_refspecs_multiple(info->refs, info->ref_count, &query, &matches);
	if (matches.nr == 0)
		goto clean_exit; /* No matches */
2132 2133 2134 2135

	/*
	 * 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
2136 2137 2138
	 * remote, we consider it to be stale. In order to deal with
	 * overlapping refspecs, we need to go over all of the
	 * matching refs.
2139
	 */
2140 2141 2142 2143 2144 2145 2146 2147
	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) {
2148 2149
		struct ref *ref = make_linked_ref(refname, &info->stale_refs_tail);
		hashcpy(ref->new_sha1, sha1);
2150
	}
2151

2152 2153
clean_exit:
	string_list_clear(&matches, 0);
2154 2155 2156
	return 0;
}

2157
struct ref *get_stale_heads(struct refspec *refs, int ref_count, struct ref *fetch_map)
2158 2159
{
	struct ref *ref, *stale_refs = NULL;
2160
	struct string_list ref_names = STRING_LIST_INIT_NODUP;
2161 2162 2163
	struct stale_heads_info info;
	info.ref_names = &ref_names;
	info.stale_refs_tail = &stale_refs;
2164 2165
	info.refs = refs;
	info.ref_count = ref_count;
2166
	for (ref = fetch_map; ref; ref = ref->next)
2167
		string_list_append(&ref_names, ref->name);
2168
	string_list_sort(&ref_names);
2169 2170 2171 2172
	for_each_ref(get_stale_heads_cb, &info);
	string_list_clear(&ref_names, 0);
	return stale_refs;
}
2173 2174 2175 2176

/*
 * Compare-and-swap
 */
2177
static void clear_cas_option(struct push_cas_option *cas)
2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 2190 2191 2192 2193 2194 2195 2196 2197 2198 2199 2200 2201 2202 2203 2204 2205 2206 2207 2208 2209 2210 2211 2212 2213 2214 2215 2216 2217 2218 2219 2220 2221 2222 2223 2224 2225 2226 2227 2228 2229
{
	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);
}
2230 2231 2232 2233 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263

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,
			   unsigned char sha1[20])
{
	char *dst;

	dst = apply_refspecs(remote->fetch, remote->fetch_refspec_nr, refname);
	if (!dst)
		return -1; /* no tracking ref for refname at remote */
	if (read_ref(dst, sha1))
		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];
2264
		if (!refname_match(entry->refname, ref->name))
2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290
			continue;
		ref->expect_old_sha1 = 1;
		if (!entry->use_tracking)
			hashcpy(ref->old_sha1_expect, cas->entry[i].expect);
		else if (remote_tracking(remote, ref->name, ref->old_sha1_expect))
			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;
	if (remote_tracking(remote, ref->name, ref->old_sha1_expect))
		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);
}