remote.c 55.7 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 52

static struct branch *current_branch;
static const char *default_remote_name;
53
static const char *branch_pushremote_name;
54
static const char *pushremote_name;
55
static int explicit_default_remote_name;
56

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

60 61 62
#define BUF_SIZE (2048)
static char buffer[BUF_SIZE];

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

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

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

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

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

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

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

121 122 123 124 125 126
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;
}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

static void read_branches_file(struct remote *remote)
{
303
	char *frag;
304
	struct strbuf branch = STRBUF_INIT;
305
	int n = 1000;
306 307 308 309 310 311 312 313 314 315 316 317 318 319
	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;
320
	remote->origin = REMOTE_BRANCHES;
321 322 323 324 325 326
	p = s + strlen(s);
	while (isspace(p[-1]))
		*--p = 0;
	len = p - s;
	p = xmalloc(len + 1);
	strcpy(p, s);
327 328

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

	strbuf_addf(&branch, ":refs/heads/%s", remote->name);
341
	add_url_alias(remote, p);
342
	add_fetch_refspec(remote, strbuf_detach(&branch, NULL));
343 344 345 346 347 348 349 350 351 352
	/*
	 * 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");
353
	add_push_refspec(remote, strbuf_detach(&branch, NULL));
354
	remote->fetch_tags = 1; /* always auto-follow */
355 356
}

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

406
	if (!starts_with(key,  "remote."))
407 408
		return 0;
	name = key + 7;
409 410 411 412 413 414

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

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

483 484 485 486
static void alias_all_urls(void)
{
	int i, j;
	for (i = 0; i < remotes_nr; i++) {
487
		int add_pushurl_aliases;
488 489
		if (!remotes[i])
			continue;
490
		for (j = 0; j < remotes[i]->pushurl_nr; j++) {
491
			remotes[i]->pushurl[j] = alias_url(remotes[i]->pushurl[j], &rewrites);
492
		}
493 494 495 496 497 498
		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);
		}
499 500 501
	}
}

502 503 504 505 506
static void read_config(void)
{
	unsigned char sha1[20];
	const char *head_ref;
	int flag;
507
	if (default_remote_name) /* did this already */
508
		return;
509
	default_remote_name = "origin";
510
	current_branch = NULL;
511
	head_ref = resolve_ref_unsafe("HEAD", sha1, 0, &flag);
512
	if (head_ref && (flag & REF_ISSYMREF) &&
513 514
	    skip_prefix(head_ref, "refs/heads/", &head_ref)) {
		current_branch = make_branch(head_ref, 0);
515
	}
516
	git_config(handle_config, NULL);
517 518 519 520
	if (branch_pushremote_name) {
		free((char *)pushremote_name);
		pushremote_name = branch_pushremote_name;
	}
521
	alias_all_urls();
522 523
}

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

	if (!refspec)
		return;

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

544
static struct refspec *parse_refspec_internal(int nr_refspec, const char **refspec, int fetch, int verify)
545 546
{
	int i;
547
	struct refspec *rs = xcalloc(nr_refspec, sizeof(*rs));
548

549
	for (i = 0; i < nr_refspec; i++) {
550
		size_t llen;
551 552
		int is_glob;
		const char *lhs, *rhs;
553
		int flags;
554

B
Benjamin Kramer 已提交
555
		is_glob = 0;
556 557 558

		lhs = refspec[i];
		if (*lhs == '+') {
559
			rs[i].force = 1;
560
			lhs++;
561
		}
562 563

		rhs = strrchr(lhs, ':');
564 565 566

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

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

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

589 590
		rs[i].pattern = is_glob;
		rs[i].src = xstrndup(lhs, llen);
591
		flags = REFNAME_ALLOW_ONELEVEL | (is_glob ? REFNAME_REFSPEC_PATTERN : 0);
592 593

		if (fetch) {
594 595
			unsigned char unused[40];

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

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

663 664 665 666
int valid_fetch_refspec(const char *fetch_refspec_str)
{
	struct refspec *refspec;

667
	refspec = parse_refspec_internal(1, &fetch_refspec_str, 1, 1);
668
	free_refspecs(refspec, 1);
669 670 671
	return !!refspec;
}

672 673
struct refspec *parse_fetch_refspec(int nr_refspec, const char **refspec)
{
674
	return parse_refspec_internal(nr_refspec, refspec, 1, 0);
675 676
}

677
static struct refspec *parse_push_refspec(int nr_refspec, const char **refspec)
678
{
679
	return parse_refspec_internal(nr_refspec, refspec, 0, 0);
680 681
}

682 683 684 685 686 687 688 689 690 691
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);
}

692 693
static int valid_remote_nick(const char *name)
{
694
	if (!name[0] || is_dot_or_dotdot(name))
695 696 697 698
		return 0;
	return !strchr(name, '/'); /* no slash */
}

699
static struct remote *remote_get_1(const char *name, const char *pushremote_name)
700 701
{
	struct remote *ret;
702
	int name_given = 0;
703

704 705 706
	if (name)
		name_given = 1;
	else {
707 708 709 710 711 712 713
		if (pushremote_name) {
			name = pushremote_name;
			name_given = 1;
		} else {
			name = default_remote_name;
			name_given = explicit_default_remote_name;
		}
714
	}
715

716
	ret = make_remote(name, 0);
717
	if (valid_remote_nick(name)) {
718
		if (!valid_remote(ret))
719
			read_remotes_file(ret);
720
		if (!valid_remote(ret))
721 722
			read_branches_file(ret);
	}
723
	if (name_given && !valid_remote(ret))
724
		add_url_alias(ret, name);
725
	if (!valid_remote(ret))
726
		return NULL;
727 728
	ret->fetch = parse_fetch_refspec(ret->fetch_refspec_nr, ret->fetch_refspec);
	ret->push = parse_push_refspec(ret->push_refspec_nr, ret->push_refspec);
729 730
	return ret;
}
731

732 733 734 735 736 737 738 739 740 741 742 743
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);
}

744 745
int remote_is_configured(const char *name)
{
746 747
	struct remotes_hash_key lookup;
	struct hashmap_entry lookup_entry;
748 749
	read_config();

750 751 752 753 754 755
	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;
756 757
}

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

777 778
static void handle_duplicate(struct ref *ref1, struct ref *ref2)
{
779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800
	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"));
		}
	}
801 802 803 804
	free(ref2->peer_ref);
	free(ref2);
}

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

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

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

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

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

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

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

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

877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902
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);
		}
	}
}

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

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

913 914 915 916
	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;
917

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

934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952
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 已提交
953 954 955 956 957 958 959 960 961 962
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;
}

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

J
Jeff King 已提交
968
struct ref *copy_ref(const struct ref *ref)
969
{
970 971 972 973 974 975 976 977 978 979 980 981
	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;
	cpy->symref = ref->symref ? xstrdup(ref->symref) : NULL;
	cpy->remote_status = ref->remote_status ? xstrdup(ref->remote_status) : NULL;
	cpy->peer_ref = copy_ref(ref->peer_ref);
	return cpy;
982 983
}

984 985 986 987 988 989 990 991 992 993 994 995
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;
}

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

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

1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036
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);
}

1037 1038 1039
int count_refspec_match(const char *pattern,
			struct ref *refs,
			struct ref **matched_ref)
1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050
{
	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);

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

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

1101 1102 1103 1104 1105 1106 1107
static struct ref *alloc_delete_ref(void)
{
	struct ref *ref = alloc_ref("(delete)");
	hashclr(ref->new_sha1);
	return ref;
}

1108 1109
static int try_explicit_object_name(const char *name,
				    struct ref **match)
1110 1111 1112
{
	unsigned char sha1[20];

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

1119
	if (get_sha1(name, sha1))
1120 1121 1122 1123 1124 1125 1126
		return -1;

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

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

1136 1137 1138 1139 1140
static char *guess_ref(const char *name, struct ref *peer)
{
	struct strbuf buf = STRBUF_INIT;
	unsigned char sha1[20];

1141
	const char *r = resolve_ref_unsafe(peer->name, sha1, 1, NULL);
1142 1143 1144
	if (!r)
		return NULL;

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

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

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

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

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

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

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

1198
	if (!dst_value) {
1199 1200 1201
		unsigned char sha1[20];
		int flag;

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

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

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++)
1255 1256
		errs += match_explicit(src, dst, dst_tail, &rs[i]);
	return errs;
1257 1258
}

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

1273 1274
		if (rs[i].pattern) {
			const char *dst_side = rs[i].dst ? rs[i].dst : rs[i].src;
F
Felipe Contreras 已提交
1275 1276 1277 1278 1279 1280
			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) {
1281 1282 1283 1284
				matching_refs = i;
				break;
			}
		}
1285
	}
1286
	if (matching_refs == -1)
1287
		return NULL;
1288 1289 1290 1291 1292 1293 1294 1295

	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.
		 */
1296
		if (!send_mirror && !starts_with(ref->name, "refs/heads/"))
1297 1298 1299 1300 1301 1302
			return NULL;
		name = xstrdup(ref->name);
	}
	if (ret_pat)
		*ret_pat = pat;
	return name;
1303 1304
}

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

J
Junio C Hamano 已提交
1313 1314 1315 1316 1317 1318 1319 1320 1321 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
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);
1351
		if (starts_with(ref->name, "refs/tags/"))
J
Junio C Hamano 已提交
1352 1353 1354 1355 1356 1357 1358 1359
			string_list_append(&dst_tag, ref->name);
	}
	clear_commit_marks_many(sent_tips.nr, sent_tips.tip, TMP_MARK);

	sort_string_list(&dst_tag);

	/* Collect tags they do not have. */
	for (ref = src; ref; ref = ref->next) {
1360
		if (!starts_with(ref->name, "refs/tags/"))
J
Junio C Hamano 已提交
1361 1362 1363 1364 1365 1366 1367 1368 1369 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
			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);
}

1408 1409 1410 1411 1412 1413 1414 1415
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;
}

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

	sort_string_list(ref_index);
}

1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448
/*
 * 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;
}

1449
/*
1450 1451 1452 1453 1454 1455
 * 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).
1456
 */
1457 1458
int match_push_refs(struct ref *src, struct ref **dst,
		    int nr_refspec, const char **refspec, int flags)
1459
{
1460
	struct refspec *rs;
A
Andy Whitcroft 已提交
1461 1462
	int send_all = flags & MATCH_REFS_ALL;
	int send_mirror = flags & MATCH_REFS_MIRROR;
F
Felipe Contreras 已提交
1463
	int send_prune = flags & MATCH_REFS_PRUNE;
1464
	int errs;
1465
	static const char *default_refspec[] = { ":", NULL };
1466
	struct ref *ref, **dst_tail = tail_ref(dst);
1467
	struct string_list dst_ref_index = STRING_LIST_INIT_NODUP;
1468

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

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

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

1487 1488 1489 1490 1491
		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;
1492 1493 1494 1495 1496 1497 1498 1499 1500
		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 已提交
1501
				 * --all or --mirror.
1502 1503
				 */
				goto free_name;
A
Andy Whitcroft 已提交
1504

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

1517 1518
	string_list_clear(&dst_ref_index, 0);

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

F
Felipe Contreras 已提交
1522
	if (send_prune) {
1523
		struct string_list src_ref_index = STRING_LIST_INIT_NODUP;
F
Felipe Contreras 已提交
1524 1525 1526 1527 1528 1529 1530 1531 1532 1533
		/* 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) {
1534 1535 1536 1537
				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 已提交
1538 1539 1540 1541
					ref->peer_ref = alloc_delete_ref();
				free(src_name);
			}
		}
1542
		string_list_clear(&src_ref_index, 0);
F
Felipe Contreras 已提交
1543
	}
1544 1545
	if (errs)
		return -1;
1546 1547
	return 0;
}
1548

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

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

1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569
		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 已提交
1570
		/*
1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590
		 * 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.
		 *
1591 1592 1593
		 * Decide whether an individual refspec A:B can be
		 * pushed.  The push will succeed if any of the
		 * following are true:
1594
		 *
C
Chris Rorvick 已提交
1595
		 * (1) the remote reference B does not exist
1596
		 *
C
Chris Rorvick 已提交
1597 1598
		 * (2) the remote reference B is being removed (i.e.,
		 *     pushing :B where no source is specified)
1599
		 *
1600 1601 1602
		 * (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.
1603
		 *
C
Chris Rorvick 已提交
1604 1605
		 * (4) it is forced using the +A:B notation, or by
		 *     passing the --force argument
1606 1607
		 */

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

		/*
		 * "--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;
1628 1629 1630
	}
}

1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643
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);
	if (ret && ret->remote_name) {
		ret->remote = remote_get(ret->remote_name);
		if (ret->merge_nr) {
			int i;
F
Felipe Contreras 已提交
1644
			ret->merge = xcalloc(ret->merge_nr, sizeof(*ret->merge));
1645 1646 1647
			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]);
1648 1649 1650
				if (remote_find_tracking(ret->remote, ret->merge[i])
				    && !strcmp(ret->remote_name, "."))
					ret->merge[i]->dst = xstrdup(ret->merge_name[i]);
1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661
			}
		}
	}
	return ret;
}

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

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

1671 1672 1673 1674 1675 1676 1677 1678 1679 1680
static int ignore_symref_update(const char *refname)
{
	unsigned char sha1[20];
	int flag;

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

1681 1682 1683 1684 1685 1686 1687
/*
 * 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.
 */
1688
static struct ref *get_expanded_map(const struct ref *remote_refs,
1689 1690
				    const struct refspec *refspec)
{
1691
	const struct ref *ref;
1692 1693 1694 1695
	struct ref *ret = NULL;
	struct ref **tail = &ret;

	for (ref = remote_refs; ref; ref = ref->next) {
1696 1697
		char *expn_name = NULL;

1698 1699
		if (strchr(ref->name, '^'))
			continue; /* a dereference item */
1700
		if (match_name_with_pattern(refspec->src, ref->name,
1701 1702
					    refspec->dst, &expn_name) &&
		    !ignore_symref_update(expn_name)) {
1703 1704
			struct ref *cpy = copy_ref(ref);

1705
			cpy->peer_ref = alloc_ref(expn_name);
1706 1707 1708 1709 1710
			if (refspec->force)
				cpy->peer_ref->force = 1;
			*tail = cpy;
			tail = &cpy->next;
		}
1711
		free(expn_name);
1712 1713 1714 1715 1716
	}

	return ret;
}

1717
static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
1718
{
1719
	const struct ref *ref;
1720
	for (ref = refs; ref; ref = ref->next) {
1721
		if (refname_match(name, ref->name))
1722 1723 1724 1725 1726
			return ref;
	}
	return NULL;
}

1727
struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
1728
{
1729
	const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
1730 1731

	if (!ref)
1732
		return NULL;
1733 1734 1735 1736 1737 1738

	return copy_ref(ref);
}

static struct ref *get_local_ref(const char *name)
{
1739
	if (!name || name[0] == '\0')
1740 1741
		return NULL;

1742
	if (starts_with(name, "refs/"))
1743
		return alloc_ref(name);
1744

1745 1746 1747
	if (starts_with(name, "heads/") ||
	    starts_with(name, "tags/") ||
	    starts_with(name, "remotes/"))
R
René Scharfe 已提交
1748
		return alloc_ref_with_prefix("refs/", 5, name);
1749

R
René Scharfe 已提交
1750
	return alloc_ref_with_prefix("refs/heads/", 11, name);
1751 1752
}

1753
int get_fetch_map(const struct ref *remote_refs,
1754
		  const struct refspec *refspec,
1755 1756
		  struct ref ***tail,
		  int missing_ok)
1757
{
D
Daniel Barkalow 已提交
1758
	struct ref *ref_map, **rmp;
1759 1760 1761 1762

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

1765 1766 1767 1768 1769 1770
		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);
		}
1771 1772 1773 1774 1775 1776 1777
		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;
		}
1778 1779
	}

D
Daniel Barkalow 已提交
1780 1781
	for (rmp = &ref_map; *rmp; ) {
		if ((*rmp)->peer_ref) {
1782
			if (!starts_with((*rmp)->peer_ref->name, "refs/") ||
1783
			    check_refname_format((*rmp)->peer_ref->name, 0)) {
D
Daniel Barkalow 已提交
1784 1785 1786 1787 1788 1789 1790 1791 1792 1793
				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);
1794 1795
	}

1796 1797
	if (ref_map)
		tail_link_ref(ref_map, tail);
1798 1799 1800

	return 0;
}
1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812

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

1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830
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;

1831 1832
	/*
	 * Both new and old must be commit-ish and new is descendant of
1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862
	 * 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;
}

1863
/*
1864 1865 1866 1867 1868
 * 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).
1869 1870 1871 1872 1873 1874 1875 1876 1877 1878
 */
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;

1879
	/* Cannot stat unless we are marked to build on top of somebody else. */
1880 1881 1882 1883
	if (!branch ||
	    !branch->merge || !branch->merge[0] || !branch->merge[0]->dst)
		return 0;

1884
	/* Cannot stat if what we used to build on no longer exists */
1885
	base = branch->merge[0]->dst;
1886
	if (read_ref(base, sha1))
1887
		return -1;
1888
	theirs = lookup_commit_reference(sha1);
1889
	if (!theirs)
1890
		return -1;
1891

1892
	if (read_ref(branch->refname, sha1))
1893
		return -1;
1894
	ours = lookup_commit_reference(sha1);
1895
	if (!ours)
1896
		return -1;
1897 1898

	/* are we the same? */
1899 1900 1901 1902
	if (theirs == ours) {
		*num_theirs = *num_ours = 0;
		return 1;
	}
1903

1904
	/* Run "rev-list --left-right ours...theirs" internally... */
1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917
	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);
1918 1919
	if (prepare_revision_walk(&revs))
		die("revision walk setup failed");
1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932

	/* ... 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)++;
	}
1933 1934 1935 1936

	/* clear object flags smudged by the above traversal */
	clear_commit_marks(ours, ALL_REV_FLAGS);
	clear_commit_marks(theirs, ALL_REV_FLAGS);
1937 1938 1939 1940 1941 1942 1943 1944
	return 1;
}

/*
 * Return true when there is anything to report, otherwise false.
 */
int format_tracking_info(struct branch *branch, struct strbuf *sb)
{
1945
	int ours, theirs;
1946
	char *base;
1947
	int upstream_is_gone = 0;
1948

1949 1950 1951
	switch (stat_tracking_info(branch, &ours, &theirs)) {
	case 0:
		/* no base */
1952
		return 0;
1953 1954 1955 1956 1957 1958 1959 1960
	case -1:
		/* with "gone" base */
		upstream_is_gone = 1;
		break;
	default:
		/* with base */
		break;
	}
1961

1962
	base = shorten_unambiguous_ref(branch->merge[0]->dst, 0);
1963 1964 1965 1966 1967 1968 1969
	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"));
1970 1971 1972 1973
	} else if (!ours && !theirs) {
		strbuf_addf(sb,
			_("Your branch is up-to-date with '%s'.\n"),
			base);
1974
	} else if (!theirs) {
1975 1976 1977
		strbuf_addf(sb,
			Q_("Your branch is ahead of '%s' by %d commit.\n",
			   "Your branch is ahead of '%s' by %d commits.\n",
1978 1979
			   ours),
			base, ours);
1980 1981 1982
		if (advice_status_hints)
			strbuf_addf(sb,
				_("  (use \"git push\" to publish your local commits)\n"));
1983
	} else if (!ours) {
1984 1985 1986 1987 1988
		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",
1989 1990
			   theirs),
			base, theirs);
1991 1992 1993
		if (advice_status_hints)
			strbuf_addf(sb,
				_("  (use \"git pull\" to update your local branch)\n"));
1994
	} else {
1995 1996 1997 1998 1999 2000 2001
		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",
2002 2003
			   theirs),
			base, ours, theirs);
2004 2005 2006
		if (advice_status_hints)
			strbuf_addf(sb,
				_("  (use \"git pull\" to merge the remote branch into yours)\n"));
2007
	}
2008
	free(base);
2009 2010
	return 1;
}
2011 2012 2013 2014 2015 2016 2017 2018

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 */
2019
	if (check_refname_format(refname + 5, 0))
2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 2030 2031 2032
		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)
{
2033
	struct ref *local_refs = NULL, **local_tail = &local_refs;
2034 2035 2036
	for_each_ref(one_local_ref, &local_tail);
	return local_refs;
}
J
Jay Soffian 已提交
2037

2038 2039 2040
struct ref *guess_remote_head(const struct ref *head,
			      const struct ref *refs,
			      int all)
J
Jay Soffian 已提交
2041 2042
{
	const struct ref *r;
2043 2044
	struct ref *list = NULL;
	struct ref **tail = &list;
J
Jay Soffian 已提交
2045

2046
	if (!head)
J
Jay Soffian 已提交
2047 2048
		return NULL;

2049 2050 2051 2052 2053 2054 2055 2056
	/*
	 * 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 已提交
2057
	/* If refs/heads/master could be right, it is. */
2058 2059 2060 2061 2062
	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 已提交
2063 2064

	/* Look for another ref that points there */
2065
	for (r = refs; r; r = r->next) {
2066
		if (r != head &&
2067
		    starts_with(r->name, "refs/heads/") &&
2068
		    !hashcmp(r->old_sha1, head->old_sha1)) {
2069 2070 2071 2072 2073 2074
			*tail = copy_ref(r);
			tail = &((*tail)->next);
			if (!all)
				break;
		}
	}
J
Jay Soffian 已提交
2075

2076
	return list;
J
Jay Soffian 已提交
2077
}
2078 2079 2080 2081

struct stale_heads_info {
	struct string_list *ref_names;
	struct ref **stale_refs_tail;
2082 2083
	struct refspec *refs;
	int ref_count;
2084 2085 2086 2087 2088 2089
};

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;
2090
	struct string_list matches = STRING_LIST_INIT_DUP;
2091
	struct refspec query;
2092
	int i, stale = 1;
2093 2094 2095
	memset(&query, 0, sizeof(struct refspec));
	query.dst = (char *)refname;

2096 2097 2098
	query_refspecs_multiple(info->refs, info->ref_count, &query, &matches);
	if (matches.nr == 0)
		goto clean_exit; /* No matches */
2099 2100 2101 2102

	/*
	 * 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
2103 2104 2105
	 * remote, we consider it to be stale. In order to deal with
	 * overlapping refspecs, we need to go over all of the
	 * matching refs.
2106
	 */
2107 2108 2109 2110 2111 2112 2113 2114
	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) {
2115 2116
		struct ref *ref = make_linked_ref(refname, &info->stale_refs_tail);
		hashcpy(ref->new_sha1, sha1);
2117
	}
2118

2119 2120
clean_exit:
	string_list_clear(&matches, 0);
2121 2122 2123
	return 0;
}

2124
struct ref *get_stale_heads(struct refspec *refs, int ref_count, struct ref *fetch_map)
2125 2126
{
	struct ref *ref, *stale_refs = NULL;
2127
	struct string_list ref_names = STRING_LIST_INIT_NODUP;
2128 2129 2130
	struct stale_heads_info info;
	info.ref_names = &ref_names;
	info.stale_refs_tail = &stale_refs;
2131 2132
	info.refs = refs;
	info.ref_count = ref_count;
2133
	for (ref = fetch_map; ref; ref = ref->next)
2134
		string_list_append(&ref_names, ref->name);
2135 2136 2137 2138 2139
	sort_string_list(&ref_names);
	for_each_ref(get_stale_heads_cb, &info);
	string_list_clear(&ref_names, 0);
	return stale_refs;
}
2140 2141 2142 2143 2144 2145 2146 2147 2148 2149 2150 2151 2152 2153 2154 2155 2156 2157 2158 2159 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 2190 2191 2192 2193 2194 2195 2196

/*
 * Compare-and-swap
 */
void clear_cas_option(struct push_cas_option *cas)
{
	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);
}
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 2230

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];
2231
		if (!refname_match(entry->refname, ref->name))
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
			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);
}