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

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 279
		}
	}
	fclose(f);
}

static void read_branches_file(struct remote *remote)
{
	const char *slash = strchr(remote->name, '/');
280
	char *frag;
281
	struct strbuf branch = STRBUF_INIT;
282 283 284 285 286 287 288 289 290 291 292 293 294 295 296
	int n = slash ? slash - remote->name : 1000;
	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;
297
	remote->origin = REMOTE_BRANCHES;
298 299 300 301 302 303 304 305 306 307
	p = s + strlen(s);
	while (isspace(p[-1]))
		*--p = 0;
	len = p - s;
	if (slash)
		len += strlen(slash);
	p = xmalloc(len + 1);
	strcpy(p, s);
	if (slash)
		strcat(p, slash);
308 309 310 311 312 313 314 315 316 317 318 319

	/*
	 * With "slash", e.g. "git fetch jgarzik/netdev-2.6" when
	 * reading from $GIT_DIR/branches/jgarzik fetches "HEAD" from
	 * the partial URL obtained from the branches file plus
	 * "/netdev-2.6" and does not store it in any tracking ref.
	 * #branch specifier in the file is ignored.
	 *
	 * Otherwise, the branches file would have URL and optionally
	 * #branch specified.  The "master" (or specified) branch is
	 * fetched and stored in the local branch of the same name.
	 */
320 321 322
	frag = strchr(p, '#');
	if (frag) {
		*(frag++) = '\0';
323 324 325 326 327
		strbuf_addf(&branch, "refs/heads/%s", frag);
	} else
		strbuf_addstr(&branch, "refs/heads/master");
	if (!slash) {
		strbuf_addf(&branch, ":refs/heads/%s", remote->name);
328
	} else {
329 330
		strbuf_reset(&branch);
		strbuf_addstr(&branch, "HEAD:");
331
	}
332
	add_url_alias(remote, p);
333
	add_fetch_refspec(remote, strbuf_detach(&branch, NULL));
334 335 336 337 338 339 340 341 342 343
	/*
	 * 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");
344
	add_push_refspec(remote, strbuf_detach(&branch, NULL));
345
	remote->fetch_tags = 1; /* always auto-follow */
346 347
}

348
static int handle_config(const char *key, const char *value, void *cb)
349 350 351 352
{
	const char *name;
	const char *subkey;
	struct remote *remote;
353 354 355 356 357 358
	struct branch *branch;
	if (!prefixcmp(key, "branch.")) {
		name = key + 7;
		subkey = strrchr(name, '.');
		if (!subkey)
			return 0;
359
		branch = make_branch(name, subkey - name);
360
		if (!strcmp(subkey, ".remote")) {
361 362
			if (git_config_string(&branch->remote_name, key, value))
				return -1;
363
			if (branch == current_branch) {
364
				default_remote_name = branch->remote_name;
365 366
				explicit_default_remote_name = 1;
			}
367 368 369
		} else if (!strcmp(subkey, ".merge")) {
			if (!value)
				return config_error_nonbool(key);
370
			add_merge(branch, xstrdup(value));
371
		}
372
		return 0;
373
	}
374 375
	if (!prefixcmp(key, "url.")) {
		struct rewrite *rewrite;
376
		name = key + 4;
377 378 379 380
		subkey = strrchr(name, '.');
		if (!subkey)
			return 0;
		if (!strcmp(subkey, ".insteadof")) {
381 382 383 384 385 386
			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);
387 388 389 390 391
			if (!value)
				return config_error_nonbool(key);
			add_instead_of(rewrite, xstrdup(value));
		}
	}
392 393 394
	if (prefixcmp(key,  "remote."))
		return 0;
	name = key + 7;
395 396 397 398 399
	if (*name == '/') {
		warning("Config remote shorthand cannot begin with '/': %s",
			name);
		return 0;
	}
400 401
	subkey = strrchr(name, '.');
	if (!subkey)
402
		return 0;
403
	remote = make_remote(name, subkey - name);
404
	remote->origin = REMOTE_CONFIG;
405 406 407 408
	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);
409 410
	else if (!strcmp(subkey, ".skipfetchall"))
		remote->skip_default_update = git_config_bool(key, value);
411 412 413 414 415
	else if (!strcmp(subkey, ".url")) {
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
		add_url(remote, v);
416 417 418 419 420
	} else if (!strcmp(subkey, ".pushurl")) {
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
		add_pushurl(remote, v);
421
	} else if (!strcmp(subkey, ".push")) {
422 423 424 425
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
		add_push_refspec(remote, v);
426
	} else if (!strcmp(subkey, ".fetch")) {
427 428 429 430
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
		add_fetch_refspec(remote, v);
431
	} else if (!strcmp(subkey, ".receivepack")) {
432 433 434
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
435
		if (!remote->receivepack)
436
			remote->receivepack = v;
437 438
		else
			error("more than one receivepack given, using the first");
439
	} else if (!strcmp(subkey, ".uploadpack")) {
440 441 442
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
443
		if (!remote->uploadpack)
444
			remote->uploadpack = v;
445 446
		else
			error("more than one uploadpack given, using the first");
447 448 449
	} else if (!strcmp(subkey, ".tagopt")) {
		if (!strcmp(value, "--no-tags"))
			remote->fetch_tags = -1;
450 451
		else if (!strcmp(value, "--tags"))
			remote->fetch_tags = 2;
S
Sam Vilain 已提交
452
	} else if (!strcmp(subkey, ".proxy")) {
453 454
		return git_config_string((const char **)&remote->http_proxy,
					 key, value);
455 456
	} else if (!strcmp(subkey, ".vcs")) {
		return git_config_string(&remote->foreign_vcs, key, value);
457
	}
458 459 460
	return 0;
}

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

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

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

	if (!refspec)
		return;

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

519
static struct refspec *parse_refspec_internal(int nr_refspec, const char **refspec, int fetch, int verify)
520 521 522
{
	int i;
	struct refspec *rs = xcalloc(sizeof(*rs), nr_refspec);
523

524
	for (i = 0; i < nr_refspec; i++) {
525
		size_t llen;
526 527
		int is_glob;
		const char *lhs, *rhs;
528
		int flags;
529

B
Benjamin Kramer 已提交
530
		is_glob = 0;
531 532 533

		lhs = refspec[i];
		if (*lhs == '+') {
534
			rs[i].force = 1;
535
			lhs++;
536
		}
537 538

		rhs = strrchr(lhs, ':');
539 540 541

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

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

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

564 565
		rs[i].pattern = is_glob;
		rs[i].src = xstrndup(lhs, llen);
566
		flags = REFNAME_ALLOW_ONELEVEL | (is_glob ? REFNAME_REFSPEC_PATTERN : 0);
567 568

		if (fetch) {
569 570
			unsigned char unused[40];

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

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

638 639 640 641
int valid_fetch_refspec(const char *fetch_refspec_str)
{
	struct refspec *refspec;

642
	refspec = parse_refspec_internal(1, &fetch_refspec_str, 1, 1);
643
	free_refspecs(refspec, 1);
644 645 646
	return !!refspec;
}

647 648
struct refspec *parse_fetch_refspec(int nr_refspec, const char **refspec)
{
649
	return parse_refspec_internal(nr_refspec, refspec, 1, 0);
650 651
}

652
static struct refspec *parse_push_refspec(int nr_refspec, const char **refspec)
653
{
654
	return parse_refspec_internal(nr_refspec, refspec, 0, 0);
655 656
}

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

667 668
static int valid_remote_nick(const char *name)
{
669
	if (!name[0] || is_dot_or_dotdot(name))
670 671 672 673
		return 0;
	return !strchr(name, '/'); /* no slash */
}

674
static struct remote *remote_get_1(const char *name, const char *pushremote_name)
675 676
{
	struct remote *ret;
677
	int name_given = 0;
678

679 680 681
	if (name)
		name_given = 1;
	else {
682 683 684 685 686 687 688
		if (pushremote_name) {
			name = pushremote_name;
			name_given = 1;
		} else {
			name = default_remote_name;
			name_given = explicit_default_remote_name;
		}
689
	}
690

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

707 708 709 710 711 712 713 714 715 716 717 718
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);
}

719 720 721 722 723 724 725 726 727 728 729
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;
}

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

749 750
void ref_remove_duplicates(struct ref *ref_map)
{
751
	struct string_list refs = STRING_LIST_INIT_NODUP;
752 753 754 755
	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;
756 757
		if (!ref_map->peer_ref)
			continue;
758

759
		item = string_list_lookup(&refs, ref_map->peer_ref->name);
760 761 762 763 764 765 766 767 768 769
		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);
770 771
			ref_map = prev; /* skip this; we freed it */
			continue;
772
		}
773

774
		item = string_list_insert(&refs, ref_map->peer_ref->name);
775
		item->util = ref_map;
776
	}
777
	string_list_clear(&refs, 0);
778 779
}

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

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

825
static int query_refspecs(struct refspec *refs, int ref_count, struct refspec *query)
826 827
{
	int i;
828
	int find_src = !query->src;
829

830 831
	if (find_src && !query->dst)
		return error("query_refspecs: need either src or dst");
832

833 834 835 836 837 838
	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;
839

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

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

885
struct ref *alloc_ref(const char *name)
886
{
887
	return alloc_ref_with_prefix("", 0, name);
888 889
}

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

906 907 908 909 910 911 912 913 914 915 916 917
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;
}

918
static void free_ref(struct ref *ref)
919 920 921
{
	if (!ref)
		return;
922
	free_ref(ref->peer_ref);
923 924 925 926 927
	free(ref->remote_status);
	free(ref->symref);
	free(ref);
}

928 929 930 931 932
void free_refs(struct ref *ref)
{
	struct ref *next;
	while (ref) {
		next = ref->next;
933
		free_ref(ref);
934 935 936 937
		ref = next;
	}
}

938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958
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);
}

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

973
		if (!refname_match(pattern, name, ref_rev_parse_rules))
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 1009 1010 1011 1012
			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;
	}
}

1013
static void tail_link_ref(struct ref *ref, struct ref ***tail)
1014 1015
{
	**tail = ref;
1016 1017
	while (ref->next)
		ref = ref->next;
1018 1019 1020
	*tail = &ref->next;
}

1021 1022 1023 1024 1025 1026 1027
static struct ref *alloc_delete_ref(void)
{
	struct ref *ref = alloc_ref("(delete)");
	hashclr(ref->new_sha1);
	return ref;
}

1028 1029 1030 1031 1032
static struct ref *try_explicit_object_name(const char *name)
{
	unsigned char sha1[20];
	struct ref *ref;

1033 1034
	if (!*name)
		return alloc_delete_ref();
1035 1036
	if (get_sha1(name, sha1))
		return NULL;
1037
	ref = alloc_ref(name);
1038 1039 1040 1041
	hashcpy(ref->new_sha1, sha1);
	return ref;
}

1042
static struct ref *make_linked_ref(const char *name, struct ref ***tail)
1043
{
1044
	struct ref *ret = alloc_ref(name);
1045 1046
	tail_link_ref(ret, tail);
	return ret;
1047
}
1048

1049 1050 1051 1052 1053
static char *guess_ref(const char *name, struct ref *peer)
{
	struct strbuf buf = STRBUF_INIT;
	unsigned char sha1[20];

1054
	const char *r = resolve_ref_unsafe(peer->name, sha1, 1, NULL);
1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068
	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);
}

1069 1070
static int match_explicit(struct ref *src, struct ref *dst,
			  struct ref ***dst_tail,
1071
			  struct refspec *rs)
1072
{
1073
	struct ref *matched_src, *matched_dst;
1074
	int copy_src;
1075

1076
	const char *dst_value = rs->dst;
1077
	char *dst_guess;
1078

1079
	if (rs->pattern || rs->matching)
1080
		return 0;
1081

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

1101
	if (!dst_value) {
1102 1103 1104
		unsigned char sha1[20];
		int flag;

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

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

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++)
1156 1157
		errs += match_explicit(src, dst, dst_tail, &rs[i]);
	return errs;
1158 1159
}

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

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

	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;
1204 1205
}

1206 1207 1208 1209 1210 1211 1212 1213
static struct ref **tail_ref(struct ref **head)
{
	struct ref **tail = head;
	while (*tail)
		tail = &((*tail)->next);
	return tail;
}

J
Junio C Hamano 已提交
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 1305 1306 1307 1308
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);
}

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

1328 1329 1330 1331 1332
	if (!nr_refspec) {
		nr_refspec = 1;
		refspec = default_refspec;
	}
	rs = parse_push_refspec(nr_refspec, (const char **) refspec);
1333
	errs = match_explicit_refs(src, *dst, &dst_tail, rs, nr_refspec);
1334 1335

	/* pick the remainder */
1336
	for (ref = src; ref; ref = ref->next) {
1337
		struct ref *dst_peer;
1338 1339
		const struct refspec *pat = NULL;
		char *dst_name;
1340

F
Felipe Contreras 已提交
1341
		dst_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_SRC, &pat);
1342
		if (!dst_name)
1343 1344
			continue;

1345
		dst_peer = find_ref_by_name(*dst, dst_name);
1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357
		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 已提交
1358

1359
			/* Create a new one and link it */
1360
			dst_peer = make_linked_ref(dst_name, &dst_tail);
1361
			hashcpy(dst_peer->new_sha1, ref->new_sha1);
1362
		}
1363
		dst_peer->peer_ref = copy_ref(ref);
1364
		dst_peer->force = pat->force;
1365 1366
	free_name:
		free(dst_name);
1367
	}
J
Junio C Hamano 已提交
1368 1369 1370 1371

	if (flags & MATCH_REFS_FOLLOW_TAGS)
		add_missing_tags(src, dst, &dst_tail);

F
Felipe Contreras 已提交
1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388
	if (send_prune) {
		/* 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) {
				if (!find_ref_by_name(src, src_name))
					ref->peer_ref = alloc_delete_ref();
				free(src_name);
			}
		}
	}
1389 1390
	if (errs)
		return -1;
1391 1392
	return 0;
}
1393

1394 1395 1396 1397 1398 1399
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) {
1400 1401
		int force_ref_update = ref->force || force_update;

1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413
		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 已提交
1414
		/*
1415 1416 1417
		 * Decide whether an individual refspec A:B can be
		 * pushed.  The push will succeed if any of the
		 * following are true:
1418
		 *
C
Chris Rorvick 已提交
1419
		 * (1) the remote reference B does not exist
1420
		 *
C
Chris Rorvick 已提交
1421 1422
		 * (2) the remote reference B is being removed (i.e.,
		 *     pushing :B where no source is specified)
1423
		 *
1424 1425 1426
		 * (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.
1427
		 *
C
Chris Rorvick 已提交
1428 1429
		 * (4) it is forced using the +A:B notation, or by
		 *     passing the --force argument
1430 1431
		 */

1432
		if (!ref->deletion && !is_null_sha1(ref->old_sha1)) {
1433 1434 1435 1436
			int why = 0; /* why would this push require --force? */

			if (!prefixcmp(ref->name, "refs/tags/"))
				why = REF_STATUS_REJECT_ALREADY_EXISTS;
1437 1438 1439 1440 1441 1442
			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))
1443 1444 1445 1446 1447
				why = REF_STATUS_REJECT_NONFASTFORWARD;

			if (!force_ref_update)
				ref->status = why;
			else if (why)
1448
				ref->forced_update = 1;
1449 1450 1451 1452
		}
	}
}

1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470
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;
			ret->merge = xcalloc(sizeof(*ret->merge),
					     ret->merge_nr);
			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]);
1471 1472 1473
				if (remote_find_tracking(ret->remote, ret->merge[i])
				    && !strcmp(ret->remote_name, "."))
					ret->merge[i]->dst = xstrdup(ret->merge_name[i]);
1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484
			}
		}
	}
	return ret;
}

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

1485 1486 1487
int branch_merge_matches(struct branch *branch,
		                 int i,
		                 const char *refname)
1488
{
1489
	if (!branch || i < 0 || i >= branch->merge_nr)
1490
		return 0;
1491
	return refname_match(branch->merge[i]->src, refname, ref_fetch_rules);
1492
}
1493

1494 1495 1496 1497 1498 1499 1500 1501 1502 1503
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);
}

1504
static struct ref *get_expanded_map(const struct ref *remote_refs,
1505 1506
				    const struct refspec *refspec)
{
1507
	const struct ref *ref;
1508 1509 1510
	struct ref *ret = NULL;
	struct ref **tail = &ret;

1511
	char *expn_name;
1512 1513 1514 1515

	for (ref = remote_refs; ref; ref = ref->next) {
		if (strchr(ref->name, '^'))
			continue; /* a dereference item */
1516
		if (match_name_with_pattern(refspec->src, ref->name,
1517 1518
					    refspec->dst, &expn_name) &&
		    !ignore_symref_update(expn_name)) {
1519 1520
			struct ref *cpy = copy_ref(ref);

1521 1522
			cpy->peer_ref = alloc_ref(expn_name);
			free(expn_name);
1523 1524 1525 1526 1527 1528 1529 1530 1531 1532
			if (refspec->force)
				cpy->peer_ref->force = 1;
			*tail = cpy;
			tail = &cpy->next;
		}
	}

	return ret;
}

1533
static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
1534
{
1535
	const struct ref *ref;
1536
	for (ref = refs; ref; ref = ref->next) {
1537
		if (refname_match(name, ref->name, ref_fetch_rules))
1538 1539 1540 1541 1542
			return ref;
	}
	return NULL;
}

1543
struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
1544
{
1545
	const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
1546 1547

	if (!ref)
1548
		return NULL;
1549 1550 1551 1552 1553 1554

	return copy_ref(ref);
}

static struct ref *get_local_ref(const char *name)
{
1555
	if (!name || name[0] == '\0')
1556 1557
		return NULL;

1558 1559
	if (!prefixcmp(name, "refs/"))
		return alloc_ref(name);
1560 1561 1562

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

R
René Scharfe 已提交
1566
	return alloc_ref_with_prefix("refs/heads/", 11, name);
1567 1568
}

1569
int get_fetch_map(const struct ref *remote_refs,
1570
		  const struct refspec *refspec,
1571 1572
		  struct ref ***tail,
		  int missing_ok)
1573
{
D
Daniel Barkalow 已提交
1574
	struct ref *ref_map, **rmp;
1575 1576 1577 1578

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

1581 1582 1583 1584 1585 1586
		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);
		}
1587 1588 1589 1590 1591 1592 1593
		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;
		}
1594 1595
	}

D
Daniel Barkalow 已提交
1596 1597
	for (rmp = &ref_map; *rmp; ) {
		if ((*rmp)->peer_ref) {
1598 1599
			if (prefixcmp((*rmp)->peer_ref->name, "refs/") ||
			    check_refname_format((*rmp)->peer_ref->name, 0)) {
D
Daniel Barkalow 已提交
1600 1601 1602 1603 1604 1605 1606 1607 1608 1609
				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);
1610 1611
	}

1612 1613
	if (ref_map)
		tail_link_ref(ref_map, tail);
1614 1615 1616

	return 0;
}
1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628

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

1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646
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;

1647 1648
	/*
	 * Both new and old must be commit-ish and new is descendant of
1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678
	 * 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;
}

1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703
/*
 * Return true if there is anything to report, otherwise false.
 */
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;

	/*
	 * Nothing to report unless we are marked to build on top of
	 * somebody else.
	 */
	if (!branch ||
	    !branch->merge || !branch->merge[0] || !branch->merge[0]->dst)
		return 0;

	/*
	 * If what we used to build on no longer exists, there is
	 * nothing to report.
	 */
	base = branch->merge[0]->dst;
1704
	if (read_ref(base, sha1))
1705
		return 0;
1706
	theirs = lookup_commit_reference(sha1);
1707 1708 1709
	if (!theirs)
		return 0;

1710
	if (read_ref(branch->refname, sha1))
1711
		return 0;
1712
	ours = lookup_commit_reference(sha1);
1713 1714 1715 1716 1717 1718 1719
	if (!ours)
		return 0;

	/* are we the same? */
	if (theirs == ours)
		return 0;

1720
	/* Run "rev-list --left-right ours...theirs" internally... */
1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747
	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)++;
	}
1748 1749 1750 1751

	/* clear object flags smudged by the above traversal */
	clear_commit_marks(ours, ALL_REV_FLAGS);
	clear_commit_marks(theirs, ALL_REV_FLAGS);
1752 1753 1754 1755 1756 1757 1758 1759 1760
	return 1;
}

/*
 * Return true when there is anything to report, otherwise false.
 */
int format_tracking_info(struct branch *branch, struct strbuf *sb)
{
	int num_ours, num_theirs;
1761
	const char *base;
1762 1763 1764 1765 1766

	if (!stat_tracking_info(branch, &num_ours, &num_theirs))
		return 0;

	base = branch->merge[0]->dst;
1767
	base = shorten_unambiguous_ref(base, 0);
1768
	if (!num_theirs) {
1769 1770 1771 1772 1773
		strbuf_addf(sb,
			Q_("Your branch is ahead of '%s' by %d commit.\n",
			   "Your branch is ahead of '%s' by %d commits.\n",
			   num_ours),
			base, num_ours);
1774 1775 1776
		if (advice_status_hints)
			strbuf_addf(sb,
				_("  (use \"git push\" to publish your local commits)\n"));
1777
	} else if (!num_ours) {
1778 1779 1780 1781 1782 1783 1784
		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",
			   num_theirs),
			base, num_theirs);
1785 1786 1787
		if (advice_status_hints)
			strbuf_addf(sb,
				_("  (use \"git pull\" to update your local branch)\n"));
1788
	} else {
1789 1790 1791 1792 1793 1794 1795 1796 1797
		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",
			   num_theirs),
			base, num_ours, num_theirs);
1798 1799 1800
		if (advice_status_hints)
			strbuf_addf(sb,
				_("  (use \"git pull\" to merge the remote branch into yours)\n"));
1801
	}
1802 1803
	return 1;
}
1804 1805 1806 1807 1808 1809 1810 1811

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 */
1812
	if (check_refname_format(refname + 5, 0))
1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825
		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)
{
1826
	struct ref *local_refs = NULL, **local_tail = &local_refs;
1827 1828 1829
	for_each_ref(one_local_ref, &local_tail);
	return local_refs;
}
J
Jay Soffian 已提交
1830

1831 1832 1833
struct ref *guess_remote_head(const struct ref *head,
			      const struct ref *refs,
			      int all)
J
Jay Soffian 已提交
1834 1835
{
	const struct ref *r;
1836 1837
	struct ref *list = NULL;
	struct ref **tail = &list;
J
Jay Soffian 已提交
1838

1839
	if (!head)
J
Jay Soffian 已提交
1840 1841
		return NULL;

1842 1843 1844 1845 1846 1847 1848 1849
	/*
	 * 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 已提交
1850
	/* If refs/heads/master could be right, it is. */
1851 1852 1853 1854 1855
	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 已提交
1856 1857

	/* Look for another ref that points there */
1858
	for (r = refs; r; r = r->next) {
1859 1860 1861
		if (r != head &&
		    !prefixcmp(r->name, "refs/heads/") &&
		    !hashcmp(r->old_sha1, head->old_sha1)) {
1862 1863 1864 1865 1866 1867
			*tail = copy_ref(r);
			tail = &((*tail)->next);
			if (!all)
				break;
		}
	}
J
Jay Soffian 已提交
1868

1869
	return list;
J
Jay Soffian 已提交
1870
}
1871 1872 1873 1874

struct stale_heads_info {
	struct string_list *ref_names;
	struct ref **stale_refs_tail;
1875 1876
	struct refspec *refs;
	int ref_count;
1877 1878 1879 1880 1881 1882
};

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;
1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898
	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);
1899
	}
1900 1901

	free(query.src);
1902 1903 1904
	return 0;
}

1905
struct ref *get_stale_heads(struct refspec *refs, int ref_count, struct ref *fetch_map)
1906 1907
{
	struct ref *ref, *stale_refs = NULL;
1908
	struct string_list ref_names = STRING_LIST_INIT_NODUP;
1909 1910 1911
	struct stale_heads_info info;
	info.ref_names = &ref_names;
	info.stale_refs_tail = &stale_refs;
1912 1913
	info.refs = refs;
	info.ref_count = ref_count;
1914
	for (ref = fetch_map; ref; ref = ref->next)
1915
		string_list_append(&ref_names, ref->name);
1916 1917 1918 1919 1920
	sort_string_list(&ref_names);
	for_each_ref(get_stale_heads_cb, &info);
	string_list_clear(&ref_names, 0);
	return stale_refs;
}