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

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

static struct branch *current_branch;
static const char *default_remote_name;
52
static const char *pushremote_name;
53
static int explicit_default_remote_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 79
		for (j = 0; j < r->rewrite[i]->instead_of_nr; j++) {
			if (!prefixcmp(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
static struct remote *make_remote(const char *name, int len)
{
D
Daniel Barkalow 已提交
140 141
	struct remote *ret;
	int i;
142

D
Daniel Barkalow 已提交
143 144 145 146 147
	for (i = 0; i < remotes_nr; i++) {
		if (len ? (!strncmp(name, remotes[i]->name, len) &&
			   !remotes[i]->name[len]) :
		    !strcmp(name, remotes[i]->name))
			return remotes[i];
148 149
	}

D
Daniel Barkalow 已提交
150 151 152
	ret = xcalloc(1, sizeof(struct remote));
	ALLOC_GROW(remotes, remotes_nr + 1, remotes_alloc);
	remotes[remotes_nr++] = ret;
153
	if (len)
D
Daniel Barkalow 已提交
154
		ret->name = xstrndup(name, len);
155
	else
D
Daniel Barkalow 已提交
156 157
		ret->name = xstrdup(name);
	return ret;
158 159
}

160 161
static void add_merge(struct branch *branch, const char *name)
{
D
Daniel Barkalow 已提交
162 163 164
	ALLOC_GROW(branch->merge_name, branch->merge_nr + 1,
		   branch->merge_alloc);
	branch->merge_name[branch->merge_nr++] = name;
165 166 167 168
}

static struct branch *make_branch(const char *name, int len)
{
D
Daniel Barkalow 已提交
169 170
	struct branch *ret;
	int i;
171 172
	char *refname;

D
Daniel Barkalow 已提交
173 174 175 176 177
	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];
178 179
	}

D
Daniel Barkalow 已提交
180 181 182
	ALLOC_GROW(branches, branches_nr + 1, branches_alloc);
	ret = xcalloc(1, sizeof(struct branch));
	branches[branches_nr++] = ret;
183
	if (len)
D
Daniel Barkalow 已提交
184
		ret->name = xstrndup(name, len);
185
	else
D
Daniel Barkalow 已提交
186
		ret->name = xstrdup(name);
187
	refname = xmalloc(strlen(name) + strlen("refs/heads/") + 1);
188
	strcpy(refname, "refs/heads/");
D
Daniel Barkalow 已提交
189 190
	strcpy(refname + strlen("refs/heads/"), ret->name);
	ret->refname = refname;
191

D
Daniel Barkalow 已提交
192
	return ret;
193 194
}

195
static struct rewrite *make_rewrite(struct rewrites *r, const char *base, int len)
196 197 198 199
{
	struct rewrite *ret;
	int i;

200
	for (i = 0; i < r->rewrite_nr; i++) {
201
		if (len
202 203 204 205
		    ? (len == r->rewrite[i]->baselen &&
		       !strncmp(base, r->rewrite[i]->base, len))
		    : !strcmp(base, r->rewrite[i]->base))
			return r->rewrite[i];
206 207
	}

208
	ALLOC_GROW(r->rewrite, r->rewrite_nr + 1, r->rewrite_alloc);
209
	ret = xcalloc(1, sizeof(struct rewrite));
210
	r->rewrite[r->rewrite_nr++] = ret;
211
	if (len) {
212
		ret->base = xstrndup(base, len);
213 214 215
		ret->baselen = len;
	}
	else {
216
		ret->base = xstrdup(base);
217 218
		ret->baselen = strlen(base);
	}
219 220 221 222 223 224
	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);
225 226 227
	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++;
228 229
}

230 231 232 233 234 235
static void read_remotes_file(struct remote *remote)
{
	FILE *f = fopen(git_path("remotes/%s", remote->name), "r");

	if (!f)
		return;
236
	remote->origin = REMOTE_REMOTES;
237 238 239 240 241 242 243 244 245 246
	while (fgets(buffer, BUF_SIZE, f)) {
		int value_list;
		char *s, *p;

		if (!prefixcmp(buffer, "URL:")) {
			value_list = 0;
			s = buffer + 4;
		} else if (!prefixcmp(buffer, "Push:")) {
			value_list = 1;
			s = buffer + 5;
247 248 249
		} else if (!prefixcmp(buffer, "Pull:")) {
			value_list = 2;
			s = buffer + 5;
250 251 252 253 254 255 256 257 258 259 260 261 262 263
		} else
			continue;

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

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

		switch (value_list) {
		case 0:
264
			add_url_alias(remote, xstrdup(s));
265 266 267 268
			break;
		case 1:
			add_push_refspec(remote, xstrdup(s));
			break;
269 270 271
		case 2:
			add_fetch_refspec(remote, xstrdup(s));
			break;
272 273 274 275 276 277 278
		}
	}
	fclose(f);
}

static void read_branches_file(struct remote *remote)
{
279
	char *frag;
280
	struct strbuf branch = STRBUF_INIT;
281
	int n = 1000;
282 283 284 285 286 287 288 289 290 291 292 293 294 295
	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;
296
	remote->origin = REMOTE_BRANCHES;
297 298 299 300 301 302
	p = s + strlen(s);
	while (isspace(p[-1]))
		*--p = 0;
	len = p - s;
	p = xmalloc(len + 1);
	strcpy(p, s);
303 304

	/*
305
	 * The branches file would have URL and optionally
306 307 308
	 * #branch specified.  The "master" (or specified) branch is
	 * fetched and stored in the local branch of the same name.
	 */
309 310 311
	frag = strchr(p, '#');
	if (frag) {
		*(frag++) = '\0';
312 313 314
		strbuf_addf(&branch, "refs/heads/%s", frag);
	} else
		strbuf_addstr(&branch, "refs/heads/master");
315 316

	strbuf_addf(&branch, ":refs/heads/%s", remote->name);
317
	add_url_alias(remote, p);
318
	add_fetch_refspec(remote, strbuf_detach(&branch, NULL));
319 320 321 322 323 324 325 326 327 328
	/*
	 * 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");
329
	add_push_refspec(remote, strbuf_detach(&branch, NULL));
330
	remote->fetch_tags = 1; /* always auto-follow */
331 332
}

333
static int handle_config(const char *key, const char *value, void *cb)
334 335 336 337
{
	const char *name;
	const char *subkey;
	struct remote *remote;
338 339 340 341 342 343
	struct branch *branch;
	if (!prefixcmp(key, "branch.")) {
		name = key + 7;
		subkey = strrchr(name, '.');
		if (!subkey)
			return 0;
344
		branch = make_branch(name, subkey - name);
345
		if (!strcmp(subkey, ".remote")) {
346 347
			if (git_config_string(&branch->remote_name, key, value))
				return -1;
348
			if (branch == current_branch) {
349
				default_remote_name = branch->remote_name;
350 351
				explicit_default_remote_name = 1;
			}
352 353 354 355
		} else if (!strcmp(subkey, ".pushremote")) {
			if (branch == current_branch)
				if (git_config_string(&pushremote_name, key, value))
					return -1;
356 357 358
		} else if (!strcmp(subkey, ".merge")) {
			if (!value)
				return config_error_nonbool(key);
359
			add_merge(branch, xstrdup(value));
360
		}
361
		return 0;
362
	}
363 364
	if (!prefixcmp(key, "url.")) {
		struct rewrite *rewrite;
365
		name = key + 4;
366 367 368 369
		subkey = strrchr(name, '.');
		if (!subkey)
			return 0;
		if (!strcmp(subkey, ".insteadof")) {
370 371 372 373 374 375
			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);
376 377 378 379 380
			if (!value)
				return config_error_nonbool(key);
			add_instead_of(rewrite, xstrdup(value));
		}
	}
381

382 383 384
	if (prefixcmp(key,  "remote."))
		return 0;
	name = key + 7;
385 386 387 388 389 390

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

	/* Handle remote.<name>.* variables */
391 392 393 394 395
	if (*name == '/') {
		warning("Config remote shorthand cannot begin with '/': %s",
			name);
		return 0;
	}
396 397
	subkey = strrchr(name, '.');
	if (!subkey)
398
		return 0;
399
	remote = make_remote(name, subkey - name);
400
	remote->origin = REMOTE_CONFIG;
401 402 403 404
	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);
405 406
	else if (!strcmp(subkey, ".skipfetchall"))
		remote->skip_default_update = git_config_bool(key, value);
407 408 409 410 411
	else if (!strcmp(subkey, ".url")) {
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
		add_url(remote, v);
412 413 414 415 416
	} else if (!strcmp(subkey, ".pushurl")) {
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
		add_pushurl(remote, v);
417
	} else if (!strcmp(subkey, ".push")) {
418 419 420 421
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
		add_push_refspec(remote, v);
422
	} else if (!strcmp(subkey, ".fetch")) {
423 424 425 426
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
		add_fetch_refspec(remote, v);
427
	} else if (!strcmp(subkey, ".receivepack")) {
428 429 430
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
431
		if (!remote->receivepack)
432
			remote->receivepack = v;
433 434
		else
			error("more than one receivepack given, using the first");
435
	} else if (!strcmp(subkey, ".uploadpack")) {
436 437 438
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
439
		if (!remote->uploadpack)
440
			remote->uploadpack = v;
441 442
		else
			error("more than one uploadpack given, using the first");
443 444 445
	} else if (!strcmp(subkey, ".tagopt")) {
		if (!strcmp(value, "--no-tags"))
			remote->fetch_tags = -1;
446 447
		else if (!strcmp(value, "--tags"))
			remote->fetch_tags = 2;
S
Sam Vilain 已提交
448
	} else if (!strcmp(subkey, ".proxy")) {
449 450
		return git_config_string((const char **)&remote->http_proxy,
					 key, value);
451 452
	} else if (!strcmp(subkey, ".vcs")) {
		return git_config_string(&remote->foreign_vcs, key, value);
453
	}
454 455 456
	return 0;
}

457 458 459 460
static void alias_all_urls(void)
{
	int i, j;
	for (i = 0; i < remotes_nr; i++) {
461
		int add_pushurl_aliases;
462 463
		if (!remotes[i])
			continue;
464
		for (j = 0; j < remotes[i]->pushurl_nr; j++) {
465
			remotes[i]->pushurl[j] = alias_url(remotes[i]->pushurl[j], &rewrites);
466
		}
467 468 469 470 471 472
		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);
		}
473 474 475
	}
}

476 477 478 479 480
static void read_config(void)
{
	unsigned char sha1[20];
	const char *head_ref;
	int flag;
481
	if (default_remote_name) /* did this already */
482 483 484
		return;
	default_remote_name = xstrdup("origin");
	current_branch = NULL;
485
	head_ref = resolve_ref_unsafe("HEAD", sha1, 0, &flag);
486 487
	if (head_ref && (flag & REF_ISSYMREF) &&
	    !prefixcmp(head_ref, "refs/heads/")) {
488 489
		current_branch =
			make_branch(head_ref + strlen("refs/heads/"), 0);
490
	}
491
	git_config(handle_config, NULL);
492
	alias_all_urls();
493 494
}

495 496 497 498 499 500
/*
 * 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.
 */
501
static void free_refspecs(struct refspec *refspec, int nr_refspec)
502 503 504 505 506 507 508 509 510 511 512 513 514
{
	int i;

	if (!refspec)
		return;

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

515
static struct refspec *parse_refspec_internal(int nr_refspec, const char **refspec, int fetch, int verify)
516 517 518
{
	int i;
	struct refspec *rs = xcalloc(sizeof(*rs), nr_refspec);
519

520
	for (i = 0; i < nr_refspec; i++) {
521
		size_t llen;
522 523
		int is_glob;
		const char *lhs, *rhs;
524
		int flags;
525

B
Benjamin Kramer 已提交
526
		is_glob = 0;
527 528 529

		lhs = refspec[i];
		if (*lhs == '+') {
530
			rs[i].force = 1;
531
			lhs++;
532
		}
533 534

		rhs = strrchr(lhs, ':');
535 536 537

		/*
		 * Before going on, special case ":" (or "+:") as a refspec
538
		 * for pushing matching refs.
539 540 541 542 543 544
		 */
		if (!fetch && rhs == lhs && rhs[1] == '\0') {
			rs[i].matching = 1;
			continue;
		}

545
		if (rhs) {
546
			size_t rlen = strlen(++rhs);
547
			is_glob = (1 <= rlen && strchr(rhs, '*'));
D
Daniel Barkalow 已提交
548
			rs[i].dst = xstrndup(rhs, rlen);
549
		}
D
Daniel Barkalow 已提交
550

551
		llen = (rhs ? (rhs - lhs - 1) : strlen(lhs));
552
		if (1 <= llen && memchr(lhs, '*', llen)) {
553 554 555 556 557
			if ((rhs && !is_glob) || (!rhs && fetch))
				goto invalid;
			is_glob = 1;
		} else if (rhs && is_glob) {
			goto invalid;
D
Daniel Barkalow 已提交
558
		}
559

560 561
		rs[i].pattern = is_glob;
		rs[i].src = xstrndup(lhs, llen);
562
		flags = REFNAME_ALLOW_ONELEVEL | (is_glob ? REFNAME_REFSPEC_PATTERN : 0);
563 564

		if (fetch) {
565 566
			unsigned char unused[40];

567
			/* LHS */
568
			if (!*rs[i].src)
569
				; /* empty is ok; it means "HEAD" */
570 571
			else if (llen == 40 && !get_sha1_hex(rs[i].src, unused))
				rs[i].exact_sha1 = 1; /* ok */
572 573 574
			else if (!check_refname_format(rs[i].src, flags))
				; /* valid looking ref is ok */
			else
575
				goto invalid;
576
			/* RHS */
577
			if (!rs[i].dst)
578
				; /* missing is ok; it is the same as empty */
579
			else if (!*rs[i].dst)
580 581 582 583
				; /* empty is ok; it means "do not store" */
			else if (!check_refname_format(rs[i].dst, flags))
				; /* valid looking ref is ok */
			else
584
				goto invalid;
585 586 587 588 589 590 591 592 593 594 595
		} 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) {
596
				if (check_refname_format(rs[i].src, flags))
597 598 599 600 601 602 603 604 605 606 607 608
					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) {
609
				if (check_refname_format(rs[i].src, flags))
610 611 612 613
					goto invalid;
			} else if (!*rs[i].dst) {
				goto invalid;
			} else {
614
				if (check_refname_format(rs[i].dst, flags))
615 616
					goto invalid;
			}
D
Daniel Barkalow 已提交
617
		}
618 619
	}
	return rs;
620 621

 invalid:
622
	if (verify) {
623 624 625 626 627 628
		/*
		 * 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);
629 630
		return NULL;
	}
631 632 633
	die("Invalid refspec '%s'", refspec[i]);
}

634 635 636 637
int valid_fetch_refspec(const char *fetch_refspec_str)
{
	struct refspec *refspec;

638
	refspec = parse_refspec_internal(1, &fetch_refspec_str, 1, 1);
639
	free_refspecs(refspec, 1);
640 641 642
	return !!refspec;
}

643 644
struct refspec *parse_fetch_refspec(int nr_refspec, const char **refspec)
{
645
	return parse_refspec_internal(nr_refspec, refspec, 1, 0);
646 647
}

648
static struct refspec *parse_push_refspec(int nr_refspec, const char **refspec)
649
{
650
	return parse_refspec_internal(nr_refspec, refspec, 0, 0);
651 652
}

653 654 655 656 657 658 659 660 661 662
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);
}

663 664
static int valid_remote_nick(const char *name)
{
665
	if (!name[0] || is_dot_or_dotdot(name))
666 667 668 669
		return 0;
	return !strchr(name, '/'); /* no slash */
}

670
static struct remote *remote_get_1(const char *name, const char *pushremote_name)
671 672
{
	struct remote *ret;
673
	int name_given = 0;
674

675 676 677
	if (name)
		name_given = 1;
	else {
678 679 680 681 682 683 684
		if (pushremote_name) {
			name = pushremote_name;
			name_given = 1;
		} else {
			name = default_remote_name;
			name_given = explicit_default_remote_name;
		}
685
	}
686

687
	ret = make_remote(name, 0);
688
	if (valid_remote_nick(name)) {
689
		if (!valid_remote(ret))
690
			read_remotes_file(ret);
691
		if (!valid_remote(ret))
692 693
			read_branches_file(ret);
	}
694
	if (name_given && !valid_remote(ret))
695
		add_url_alias(ret, name);
696
	if (!valid_remote(ret))
697
		return NULL;
698 699
	ret->fetch = parse_fetch_refspec(ret->fetch_refspec_nr, ret->fetch_refspec);
	ret->push = parse_push_refspec(ret->push_refspec_nr, ret->push_refspec);
700 701
	return ret;
}
702

703 704 705 706 707 708 709 710 711 712 713 714
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);
}

715 716 717 718 719 720 721 722 723 724 725
int remote_is_configured(const char *name)
{
	int i;
	read_config();

	for (i = 0; i < remotes_nr; i++)
		if (!strcmp(name, remotes[i]->name))
			return 1;
	return 0;
}

726 727 728 729
int for_each_remote(each_remote_fn fn, void *priv)
{
	int i, result = 0;
	read_config();
D
Daniel Barkalow 已提交
730
	for (i = 0; i < remotes_nr && !result; i++) {
731 732 733 734
		struct remote *r = remotes[i];
		if (!r)
			continue;
		if (!r->fetch)
735 736
			r->fetch = parse_fetch_refspec(r->fetch_refspec_nr,
						       r->fetch_refspec);
737
		if (!r->push)
738 739
			r->push = parse_push_refspec(r->push_refspec_nr,
						     r->push_refspec);
740 741 742 743 744
		result = fn(r, priv);
	}
	return result;
}

745 746
void ref_remove_duplicates(struct ref *ref_map)
{
747
	struct string_list refs = STRING_LIST_INIT_NODUP;
748 749 750 751
	struct string_list_item *item = NULL;
	struct ref *prev = NULL, *next = NULL;
	for (; ref_map; prev = ref_map, ref_map = next) {
		next = ref_map->next;
752 753
		if (!ref_map->peer_ref)
			continue;
754

755
		item = string_list_lookup(&refs, ref_map->peer_ref->name);
756 757 758 759 760 761 762 763 764 765
		if (item) {
			if (strcmp(((struct ref *)item->util)->name,
				   ref_map->name))
				die("%s tracks both %s and %s",
				    ref_map->peer_ref->name,
				    ((struct ref *)item->util)->name,
				    ref_map->name);
			prev->next = ref_map->next;
			free(ref_map->peer_ref);
			free(ref_map);
766 767
			ref_map = prev; /* skip this; we freed it */
			continue;
768
		}
769

770
		item = string_list_insert(&refs, ref_map->peer_ref->name);
771
		item->util = ref_map;
772
	}
773
	string_list_clear(&refs, 0);
774 775
}

776
int remote_has_url(struct remote *remote, const char *url)
777 778
{
	int i;
779 780
	for (i = 0; i < remote->url_nr; i++) {
		if (!strcmp(remote->url[i], url))
781 782 783 784 785
			return 1;
	}
	return 0;
}

786 787
static int match_name_with_pattern(const char *key, const char *name,
				   const char *value, char **result)
788
{
D
Daniel Barkalow 已提交
789 790
	const char *kstar = strchr(key, '*');
	size_t klen;
791 792
	size_t ksuffixlen;
	size_t namelen;
D
Daniel Barkalow 已提交
793 794 795 796
	int ret;
	if (!kstar)
		die("Key '%s' of pattern had no '*'", key);
	klen = kstar - key;
797 798 799 800
	ksuffixlen = strlen(kstar + 1);
	namelen = strlen(name);
	ret = !strncmp(name, key, klen) && namelen >= klen + ksuffixlen &&
		!memcmp(name + namelen - ksuffixlen, kstar + 1, ksuffixlen);
801
	if (ret && value) {
D
Daniel Barkalow 已提交
802 803
		const char *vstar = strchr(value, '*');
		size_t vlen;
804
		size_t vsuffixlen;
D
Daniel Barkalow 已提交
805 806 807
		if (!vstar)
			die("Value '%s' of pattern has no '*'", value);
		vlen = vstar - value;
808 809
		vsuffixlen = strlen(vstar + 1);
		*result = xmalloc(vlen + vsuffixlen +
810
				  strlen(name) -
811 812 813 814 815 816
				  klen - ksuffixlen + 1);
		strncpy(*result, value, vlen);
		strncpy(*result + vlen,
			name + klen, namelen - klen - ksuffixlen);
		strcpy(*result + vlen + namelen - klen - ksuffixlen,
		       vstar + 1);
817
	}
818 819 820
	return ret;
}

821
static int query_refspecs(struct refspec *refs, int ref_count, struct refspec *query)
822 823
{
	int i;
824
	int find_src = !query->src;
825

826 827
	if (find_src && !query->dst)
		return error("query_refspecs: need either src or dst");
828

829 830 831 832 833 834
	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;
835

836
		if (!refspec->dst)
837
			continue;
838
		if (refspec->pattern) {
839
			if (match_name_with_pattern(key, needle, value, result)) {
840
				query->force = refspec->force;
841 842
				return 0;
			}
843 844
		} else if (!strcmp(needle, key)) {
			*result = xstrdup(value);
845
			query->force = refspec->force;
846
			return 0;
847 848 849 850 851
		}
	}
	return -1;
}

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

881
struct ref *alloc_ref(const char *name)
882
{
883
	return alloc_ref_with_prefix("", 0, name);
884 885
}

J
Jeff King 已提交
886
struct ref *copy_ref(const struct ref *ref)
887
{
888 889 890 891 892 893 894 895 896 897 898 899
	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;
900 901
}

902 903 904 905 906 907 908 909 910 911 912 913
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;
}

914
static void free_ref(struct ref *ref)
915 916 917
{
	if (!ref)
		return;
918
	free_ref(ref->peer_ref);
919 920 921 922 923
	free(ref->remote_status);
	free(ref->symref);
	free(ref);
}

924 925 926 927 928
void free_refs(struct ref *ref)
{
	struct ref *next;
	while (ref) {
		next = ref->next;
929
		free_ref(ref);
930 931 932 933
		ref = next;
	}
}

934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954
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);
}

955 956 957 958 959 960 961 962 963 964 965 966 967 968
static int count_refspec_match(const char *pattern,
			       struct ref *refs,
			       struct ref **matched_ref)
{
	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);

969
		if (!refname_match(pattern, name, ref_rev_parse_rules))
970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008
			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 &&
		    prefixcmp(name, "refs/heads/") &&
		    prefixcmp(name, "refs/tags/")) {
			/* 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) {
		*matched_ref = matched_weak;
		return weak_match;
	}
	else {
		*matched_ref = matched;
		return match;
	}
}

1009
static void tail_link_ref(struct ref *ref, struct ref ***tail)
1010 1011
{
	**tail = ref;
1012 1013
	while (ref->next)
		ref = ref->next;
1014 1015 1016
	*tail = &ref->next;
}

1017 1018 1019 1020 1021 1022 1023
static struct ref *alloc_delete_ref(void)
{
	struct ref *ref = alloc_ref("(delete)");
	hashclr(ref->new_sha1);
	return ref;
}

1024 1025 1026 1027 1028
static struct ref *try_explicit_object_name(const char *name)
{
	unsigned char sha1[20];
	struct ref *ref;

1029 1030
	if (!*name)
		return alloc_delete_ref();
1031 1032
	if (get_sha1(name, sha1))
		return NULL;
1033
	ref = alloc_ref(name);
1034 1035 1036 1037
	hashcpy(ref->new_sha1, sha1);
	return ref;
}

1038
static struct ref *make_linked_ref(const char *name, struct ref ***tail)
1039
{
1040
	struct ref *ret = alloc_ref(name);
1041 1042
	tail_link_ref(ret, tail);
	return ret;
1043
}
1044

1045 1046 1047 1048 1049
static char *guess_ref(const char *name, struct ref *peer)
{
	struct strbuf buf = STRBUF_INIT;
	unsigned char sha1[20];

1050
	const char *r = resolve_ref_unsafe(peer->name, sha1, 1, NULL);
1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064
	if (!r)
		return NULL;

	if (!prefixcmp(r, "refs/heads/"))
		strbuf_addstr(&buf, "refs/heads/");
	else if (!prefixcmp(r, "refs/tags/"))
		strbuf_addstr(&buf, "refs/tags/");
	else
		return NULL;

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

1065 1066
static int match_explicit(struct ref *src, struct ref *dst,
			  struct ref ***dst_tail,
1067
			  struct refspec *rs)
1068
{
1069
	struct ref *matched_src, *matched_dst;
1070
	int copy_src;
1071

1072
	const char *dst_value = rs->dst;
1073
	char *dst_guess;
1074

1075
	if (rs->pattern || rs->matching)
1076
		return 0;
1077

1078 1079 1080
	matched_src = matched_dst = NULL;
	switch (count_refspec_match(rs->src, src, &matched_src)) {
	case 1:
1081
		copy_src = 1;
1082 1083 1084 1085 1086 1087 1088
		break;
	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.
		 */
		matched_src = try_explicit_object_name(rs->src);
1089
		if (!matched_src)
1090
			return error("src refspec %s does not match any.", rs->src);
1091
		copy_src = 0;
1092 1093
		break;
	default:
1094
		return error("src refspec %s matches more than one.", rs->src);
1095
	}
1096

1097
	if (!dst_value) {
1098 1099 1100
		unsigned char sha1[20];
		int flag;

1101
		dst_value = resolve_ref_unsafe(matched_src->name, sha1, 1, &flag);
1102 1103 1104 1105 1106
		if (!dst_value ||
		    ((flag & REF_ISSYMREF) &&
		     prefixcmp(dst_value, "refs/heads/")))
			die("%s cannot be resolved to branch.",
			    matched_src->name);
1107
	}
1108

1109 1110 1111 1112
	switch (count_refspec_match(dst_value, dst, &matched_dst)) {
	case 1:
		break;
	case 0:
1113
		if (!memcmp(dst_value, "refs/", 5))
1114
			matched_dst = make_linked_ref(dst_value, dst_tail);
1115 1116 1117
		else if (is_null_sha1(matched_src->new_sha1))
			error("unable to delete '%s': remote ref does not exist",
			      dst_value);
1118
		else if ((dst_guess = guess_ref(dst_value, matched_src)))
1119
			matched_dst = make_linked_ref(dst_guess, dst_tail);
1120
		else
1121 1122 1123 1124 1125 1126
			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);
1127 1128
		break;
	default:
1129
		matched_dst = NULL;
1130 1131 1132 1133
		error("dst refspec %s matches more than one.",
		      dst_value);
		break;
	}
1134 1135 1136 1137
	if (!matched_dst)
		return -1;
	if (matched_dst->peer_ref)
		return error("dst ref %s receives from more than one src.",
1138 1139
		      matched_dst->name);
	else {
1140
		matched_dst->peer_ref = copy_src ? copy_ref(matched_src) : matched_src;
1141
		matched_dst->force = rs->force;
1142
	}
1143
	return 0;
1144 1145 1146 1147 1148 1149 1150 1151
}

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++)
1152 1153
		errs += match_explicit(src, dst, dst_tail, &rs[i]);
	return errs;
1154 1155
}

1156
static char *get_ref_match(const struct refspec *rs, int rs_nr, const struct ref *ref,
F
Felipe Contreras 已提交
1157
		int send_mirror, int direction, const struct refspec **ret_pat)
1158
{
1159 1160
	const struct refspec *pat;
	char *name;
1161
	int i;
1162
	int matching_refs = -1;
1163
	for (i = 0; i < rs_nr; i++) {
1164 1165 1166 1167 1168 1169
		if (rs[i].matching &&
		    (matching_refs == -1 || rs[i].force)) {
			matching_refs = i;
			continue;
		}

1170 1171
		if (rs[i].pattern) {
			const char *dst_side = rs[i].dst ? rs[i].dst : rs[i].src;
F
Felipe Contreras 已提交
1172 1173 1174 1175 1176 1177
			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) {
1178 1179 1180 1181
				matching_refs = i;
				break;
			}
		}
1182
	}
1183
	if (matching_refs == -1)
1184
		return NULL;
1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199

	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.
		 */
		if (!send_mirror && prefixcmp(ref->name, "refs/heads/"))
			return NULL;
		name = xstrdup(ref->name);
	}
	if (ret_pat)
		*ret_pat = pat;
	return name;
1200 1201
}

1202 1203 1204 1205 1206 1207 1208 1209
static struct ref **tail_ref(struct ref **head)
{
	struct ref **tail = head;
	while (*tail)
		tail = &((*tail)->next);
	return tail;
}

J
Junio C Hamano 已提交
1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304
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);
		if (!prefixcmp(ref->name, "refs/tags/"))
			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) {
		if (prefixcmp(ref->name, "refs/tags/"))
			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);
}

1305 1306 1307 1308 1309 1310 1311 1312
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);
}

1313
/*
1314 1315 1316 1317 1318 1319
 * 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).
1320
 */
1321 1322
int match_push_refs(struct ref *src, struct ref **dst,
		    int nr_refspec, const char **refspec, int flags)
1323
{
1324
	struct refspec *rs;
A
Andy Whitcroft 已提交
1325 1326
	int send_all = flags & MATCH_REFS_ALL;
	int send_mirror = flags & MATCH_REFS_MIRROR;
F
Felipe Contreras 已提交
1327
	int send_prune = flags & MATCH_REFS_PRUNE;
1328
	int errs;
1329
	static const char *default_refspec[] = { ":", NULL };
1330
	struct ref *ref, **dst_tail = tail_ref(dst);
1331
	struct string_list dst_ref_index = STRING_LIST_INIT_NODUP;
1332

1333 1334 1335 1336 1337
	if (!nr_refspec) {
		nr_refspec = 1;
		refspec = default_refspec;
	}
	rs = parse_push_refspec(nr_refspec, (const char **) refspec);
1338
	errs = match_explicit_refs(src, *dst, &dst_tail, rs, nr_refspec);
1339 1340

	/* pick the remainder */
1341
	for (ref = src; ref; ref = ref->next) {
1342
		struct string_list_item *dst_item;
1343
		struct ref *dst_peer;
1344 1345
		const struct refspec *pat = NULL;
		char *dst_name;
1346

F
Felipe Contreras 已提交
1347
		dst_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_SRC, &pat);
1348
		if (!dst_name)
1349 1350
			continue;

1351 1352 1353 1354 1355
		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;
1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367
		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
				 * --all nor --mirror.
				 */
				goto free_name;
A
Andy Whitcroft 已提交
1368

1369
			/* Create a new one and link it */
1370
			dst_peer = make_linked_ref(dst_name, &dst_tail);
1371
			hashcpy(dst_peer->new_sha1, ref->new_sha1);
1372 1373
			string_list_insert(&dst_ref_index,
				dst_peer->name)->util = dst_peer;
1374
		}
1375
		dst_peer->peer_ref = copy_ref(ref);
1376
		dst_peer->force = pat->force;
1377 1378
	free_name:
		free(dst_name);
1379
	}
J
Junio C Hamano 已提交
1380

1381 1382
	string_list_clear(&dst_ref_index, 0);

J
Junio C Hamano 已提交
1383 1384 1385
	if (flags & MATCH_REFS_FOLLOW_TAGS)
		add_missing_tags(src, dst, &dst_tail);

F
Felipe Contreras 已提交
1386
	if (send_prune) {
1387
		struct string_list src_ref_index = STRING_LIST_INIT_NODUP;
F
Felipe Contreras 已提交
1388 1389 1390 1391 1392 1393 1394 1395 1396 1397
		/* 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) {
1398 1399 1400 1401
				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 已提交
1402 1403 1404 1405
					ref->peer_ref = alloc_delete_ref();
				free(src_name);
			}
		}
1406
		string_list_clear(&src_ref_index, 0);
F
Felipe Contreras 已提交
1407
	}
1408 1409
	if (errs)
		return -1;
1410 1411
	return 0;
}
1412

1413 1414 1415 1416 1417 1418
void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
	int force_update)
{
	struct ref *ref;

	for (ref = remote_refs; ref; ref = ref->next) {
1419 1420
		int force_ref_update = ref->force || force_update;

1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432
		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 已提交
1433
		/*
1434 1435 1436
		 * Decide whether an individual refspec A:B can be
		 * pushed.  The push will succeed if any of the
		 * following are true:
1437
		 *
C
Chris Rorvick 已提交
1438
		 * (1) the remote reference B does not exist
1439
		 *
C
Chris Rorvick 已提交
1440 1441
		 * (2) the remote reference B is being removed (i.e.,
		 *     pushing :B where no source is specified)
1442
		 *
1443 1444 1445
		 * (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.
1446
		 *
C
Chris Rorvick 已提交
1447 1448
		 * (4) it is forced using the +A:B notation, or by
		 *     passing the --force argument
1449 1450
		 */

1451
		if (!ref->deletion && !is_null_sha1(ref->old_sha1)) {
1452 1453 1454 1455
			int why = 0; /* why would this push require --force? */

			if (!prefixcmp(ref->name, "refs/tags/"))
				why = REF_STATUS_REJECT_ALREADY_EXISTS;
1456 1457 1458 1459 1460 1461
			else if (!has_sha1_file(ref->old_sha1))
				why = REF_STATUS_REJECT_FETCH_FIRST;
			else if (!lookup_commit_reference_gently(ref->old_sha1, 1) ||
				 !lookup_commit_reference_gently(ref->new_sha1, 1))
				why = REF_STATUS_REJECT_NEEDS_FORCE;
			else if (!ref_newer(ref->new_sha1, ref->old_sha1))
1462 1463 1464 1465 1466
				why = REF_STATUS_REJECT_NONFASTFORWARD;

			if (!force_ref_update)
				ref->status = why;
			else if (why)
1467
				ref->forced_update = 1;
1468 1469 1470 1471
		}
	}
}

1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484
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 已提交
1485
			ret->merge = xcalloc(ret->merge_nr, sizeof(*ret->merge));
1486 1487 1488
			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]);
1489 1490 1491
				if (remote_find_tracking(ret->remote, ret->merge[i])
				    && !strcmp(ret->remote_name, "."))
					ret->merge[i]->dst = xstrdup(ret->merge_name[i]);
1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502
			}
		}
	}
	return ret;
}

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

1503 1504 1505
int branch_merge_matches(struct branch *branch,
		                 int i,
		                 const char *refname)
1506
{
1507
	if (!branch || i < 0 || i >= branch->merge_nr)
1508
		return 0;
1509
	return refname_match(branch->merge[i]->src, refname, ref_fetch_rules);
1510
}
1511

1512 1513 1514 1515 1516 1517 1518 1519 1520 1521
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);
}

1522
static struct ref *get_expanded_map(const struct ref *remote_refs,
1523 1524
				    const struct refspec *refspec)
{
1525
	const struct ref *ref;
1526 1527 1528
	struct ref *ret = NULL;
	struct ref **tail = &ret;

1529
	char *expn_name;
1530 1531 1532 1533

	for (ref = remote_refs; ref; ref = ref->next) {
		if (strchr(ref->name, '^'))
			continue; /* a dereference item */
1534
		if (match_name_with_pattern(refspec->src, ref->name,
1535 1536
					    refspec->dst, &expn_name) &&
		    !ignore_symref_update(expn_name)) {
1537 1538
			struct ref *cpy = copy_ref(ref);

1539 1540
			cpy->peer_ref = alloc_ref(expn_name);
			free(expn_name);
1541 1542 1543 1544 1545 1546 1547 1548 1549 1550
			if (refspec->force)
				cpy->peer_ref->force = 1;
			*tail = cpy;
			tail = &cpy->next;
		}
	}

	return ret;
}

1551
static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
1552
{
1553
	const struct ref *ref;
1554
	for (ref = refs; ref; ref = ref->next) {
1555
		if (refname_match(name, ref->name, ref_fetch_rules))
1556 1557 1558 1559 1560
			return ref;
	}
	return NULL;
}

1561
struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
1562
{
1563
	const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
1564 1565

	if (!ref)
1566
		return NULL;
1567 1568 1569 1570 1571 1572

	return copy_ref(ref);
}

static struct ref *get_local_ref(const char *name)
{
1573
	if (!name || name[0] == '\0')
1574 1575
		return NULL;

1576 1577
	if (!prefixcmp(name, "refs/"))
		return alloc_ref(name);
1578 1579 1580

	if (!prefixcmp(name, "heads/") ||
	    !prefixcmp(name, "tags/") ||
R
René Scharfe 已提交
1581 1582
	    !prefixcmp(name, "remotes/"))
		return alloc_ref_with_prefix("refs/", 5, name);
1583

R
René Scharfe 已提交
1584
	return alloc_ref_with_prefix("refs/heads/", 11, name);
1585 1586
}

1587
int get_fetch_map(const struct ref *remote_refs,
1588
		  const struct refspec *refspec,
1589 1590
		  struct ref ***tail,
		  int missing_ok)
1591
{
D
Daniel Barkalow 已提交
1592
	struct ref *ref_map, **rmp;
1593 1594 1595 1596

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

1599 1600 1601 1602 1603 1604
		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);
		}
1605 1606 1607 1608 1609 1610 1611
		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;
		}
1612 1613
	}

D
Daniel Barkalow 已提交
1614 1615
	for (rmp = &ref_map; *rmp; ) {
		if ((*rmp)->peer_ref) {
1616 1617
			if (prefixcmp((*rmp)->peer_ref->name, "refs/") ||
			    check_refname_format((*rmp)->peer_ref->name, 0)) {
D
Daniel Barkalow 已提交
1618 1619 1620 1621 1622 1623 1624 1625 1626 1627
				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);
1628 1629
	}

1630 1631
	if (ref_map)
		tail_link_ref(ref_map, tail);
1632 1633 1634

	return 0;
}
1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646

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

1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664
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;

1665 1666
	/*
	 * Both new and old must be commit-ish and new is descendant of
1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696
	 * 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;
}

1697
/*
1698 1699 1700 1701 1702
 * 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).
1703 1704 1705 1706 1707 1708 1709 1710 1711 1712
 */
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;

1713
	/* Cannot stat unless we are marked to build on top of somebody else. */
1714 1715 1716 1717
	if (!branch ||
	    !branch->merge || !branch->merge[0] || !branch->merge[0]->dst)
		return 0;

1718
	/* Cannot stat if what we used to build on no longer exists */
1719
	base = branch->merge[0]->dst;
1720
	if (read_ref(base, sha1))
1721
		return -1;
1722
	theirs = lookup_commit_reference(sha1);
1723
	if (!theirs)
1724
		return -1;
1725

1726
	if (read_ref(branch->refname, sha1))
1727
		return -1;
1728
	ours = lookup_commit_reference(sha1);
1729
	if (!ours)
1730
		return -1;
1731 1732

	/* are we the same? */
1733 1734 1735 1736
	if (theirs == ours) {
		*num_theirs = *num_ours = 0;
		return 1;
	}
1737

1738
	/* Run "rev-list --left-right ours...theirs" internally... */
1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765
	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);
	prepare_revision_walk(&revs);

	/* ... 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)++;
	}
1766 1767 1768 1769

	/* clear object flags smudged by the above traversal */
	clear_commit_marks(ours, ALL_REV_FLAGS);
	clear_commit_marks(theirs, ALL_REV_FLAGS);
1770 1771 1772 1773 1774 1775 1776 1777
	return 1;
}

/*
 * Return true when there is anything to report, otherwise false.
 */
int format_tracking_info(struct branch *branch, struct strbuf *sb)
{
1778
	int ours, theirs;
1779
	const char *base;
1780
	int upstream_is_gone = 0;
1781

1782 1783 1784
	switch (stat_tracking_info(branch, &ours, &theirs)) {
	case 0:
		/* no base */
1785
		return 0;
1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796
	case -1:
		/* with "gone" base */
		upstream_is_gone = 1;
		break;
	default:
		/* Nothing to report if neither side has changes. */
		if (!ours && !theirs)
			return 0;
		/* with base */
		break;
	}
1797 1798

	base = branch->merge[0]->dst;
1799
	base = shorten_unambiguous_ref(base, 0);
1800 1801 1802 1803 1804 1805 1806 1807
	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"));
	} else if (!theirs) {
1808 1809 1810
		strbuf_addf(sb,
			Q_("Your branch is ahead of '%s' by %d commit.\n",
			   "Your branch is ahead of '%s' by %d commits.\n",
1811 1812
			   ours),
			base, ours);
1813 1814 1815
		if (advice_status_hints)
			strbuf_addf(sb,
				_("  (use \"git push\" to publish your local commits)\n"));
1816
	} else if (!ours) {
1817 1818 1819 1820 1821
		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",
1822 1823
			   theirs),
			base, theirs);
1824 1825 1826
		if (advice_status_hints)
			strbuf_addf(sb,
				_("  (use \"git pull\" to update your local branch)\n"));
1827
	} else {
1828 1829 1830 1831 1832 1833 1834
		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",
1835 1836
			   theirs),
			base, ours, theirs);
1837 1838 1839
		if (advice_status_hints)
			strbuf_addf(sb,
				_("  (use \"git pull\" to merge the remote branch into yours)\n"));
1840
	}
1841 1842
	return 1;
}
1843 1844 1845 1846 1847 1848 1849 1850

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 */
1851
	if (check_refname_format(refname + 5, 0))
1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864
		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)
{
1865
	struct ref *local_refs = NULL, **local_tail = &local_refs;
1866 1867 1868
	for_each_ref(one_local_ref, &local_tail);
	return local_refs;
}
J
Jay Soffian 已提交
1869

1870 1871 1872
struct ref *guess_remote_head(const struct ref *head,
			      const struct ref *refs,
			      int all)
J
Jay Soffian 已提交
1873 1874
{
	const struct ref *r;
1875 1876
	struct ref *list = NULL;
	struct ref **tail = &list;
J
Jay Soffian 已提交
1877

1878
	if (!head)
J
Jay Soffian 已提交
1879 1880
		return NULL;

1881 1882 1883 1884 1885 1886 1887 1888
	/*
	 * 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 已提交
1889
	/* If refs/heads/master could be right, it is. */
1890 1891 1892 1893 1894
	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 已提交
1895 1896

	/* Look for another ref that points there */
1897
	for (r = refs; r; r = r->next) {
1898 1899 1900
		if (r != head &&
		    !prefixcmp(r->name, "refs/heads/") &&
		    !hashcmp(r->old_sha1, head->old_sha1)) {
1901 1902 1903 1904 1905 1906
			*tail = copy_ref(r);
			tail = &((*tail)->next);
			if (!all)
				break;
		}
	}
J
Jay Soffian 已提交
1907

1908
	return list;
J
Jay Soffian 已提交
1909
}
1910 1911 1912 1913

struct stale_heads_info {
	struct string_list *ref_names;
	struct ref **stale_refs_tail;
1914 1915
	struct refspec *refs;
	int ref_count;
1916 1917 1918 1919 1920 1921
};

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;
1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937
	struct refspec query;
	memset(&query, 0, sizeof(struct refspec));
	query.dst = (char *)refname;

	if (query_refspecs(info->refs, info->ref_count, &query))
		return 0; /* No matches */

	/*
	 * 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
	 * remote we consider it to be stale.
	 */
	if (!((flags & REF_ISSYMREF) ||
	      string_list_has_string(info->ref_names, query.src))) {
		struct ref *ref = make_linked_ref(refname, &info->stale_refs_tail);
		hashcpy(ref->new_sha1, sha1);
1938
	}
1939 1940

	free(query.src);
1941 1942 1943
	return 0;
}

1944
struct ref *get_stale_heads(struct refspec *refs, int ref_count, struct ref *fetch_map)
1945 1946
{
	struct ref *ref, *stale_refs = NULL;
1947
	struct string_list ref_names = STRING_LIST_INIT_NODUP;
1948 1949 1950
	struct stale_heads_info info;
	info.ref_names = &ref_names;
	info.stale_refs_tail = &stale_refs;
1951 1952
	info.refs = refs;
	info.ref_count = ref_count;
1953
	for (ref = fetch_map; ref; ref = ref->next)
1954
		string_list_append(&ref_names, ref->name);
1955 1956 1957 1958 1959
	sort_string_list(&ref_names);
	for_each_ref(get_stale_heads_cb, &info);
	string_list_clear(&ref_names, 0);
	return stale_refs;
}