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

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

const struct refspec *tag_refspec = &s_tag_refspec;

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

38
static struct remote **remotes;
D
Daniel Barkalow 已提交
39 40
static int remotes_alloc;
static int remotes_nr;
41

42
static struct branch **branches;
D
Daniel Barkalow 已提交
43 44
static int branches_alloc;
static int branches_nr;
45 46 47

static struct branch *current_branch;
static const char *default_remote_name;
48
static int explicit_default_remote_name;
49

50
static struct rewrites rewrites;
51
static struct rewrites rewrites_push;
52

53 54 55
#define BUF_SIZE (2048)
static char buffer[BUF_SIZE];

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

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

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

85
	ret = xmalloc(r->rewrite[longest_i]->baselen +
86
		     (strlen(url) - longest->len) + 1);
87 88
	strcpy(ret, r->rewrite[longest_i]->base);
	strcpy(ret + r->rewrite[longest_i]->baselen, url + longest->len);
89
	return ret;
90 91
}

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

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

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

114 115 116 117 118 119
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;
}

120 121 122 123 124 125 126 127 128 129 130 131 132
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);
}

133 134
static struct remote *make_remote(const char *name, int len)
{
D
Daniel Barkalow 已提交
135 136
	struct remote *ret;
	int i;
137

D
Daniel Barkalow 已提交
138 139 140 141 142
	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];
143 144
	}

D
Daniel Barkalow 已提交
145 146 147
	ret = xcalloc(1, sizeof(struct remote));
	ALLOC_GROW(remotes, remotes_nr + 1, remotes_alloc);
	remotes[remotes_nr++] = ret;
148
	if (len)
D
Daniel Barkalow 已提交
149
		ret->name = xstrndup(name, len);
150
	else
D
Daniel Barkalow 已提交
151 152
		ret->name = xstrdup(name);
	return ret;
153 154
}

155 156
static void add_merge(struct branch *branch, const char *name)
{
D
Daniel Barkalow 已提交
157 158 159
	ALLOC_GROW(branch->merge_name, branch->merge_nr + 1,
		   branch->merge_alloc);
	branch->merge_name[branch->merge_nr++] = name;
160 161 162 163
}

static struct branch *make_branch(const char *name, int len)
{
D
Daniel Barkalow 已提交
164 165
	struct branch *ret;
	int i;
166 167
	char *refname;

D
Daniel Barkalow 已提交
168 169 170 171 172
	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];
173 174
	}

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

D
Daniel Barkalow 已提交
187
	return ret;
188 189
}

190
static struct rewrite *make_rewrite(struct rewrites *r, const char *base, int len)
191 192 193 194
{
	struct rewrite *ret;
	int i;

195
	for (i = 0; i < r->rewrite_nr; i++) {
196
		if (len
197 198 199 200
		    ? (len == r->rewrite[i]->baselen &&
		       !strncmp(base, r->rewrite[i]->base, len))
		    : !strcmp(base, r->rewrite[i]->base))
			return r->rewrite[i];
201 202
	}

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

225 226 227 228 229 230
static void read_remotes_file(struct remote *remote)
{
	FILE *f = fopen(git_path("remotes/%s", remote->name), "r");

	if (!f)
		return;
231
	remote->origin = REMOTE_REMOTES;
232 233 234 235 236 237 238 239 240 241
	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;
242 243 244
		} else if (!prefixcmp(buffer, "Pull:")) {
			value_list = 2;
			s = buffer + 5;
245 246 247 248 249 250 251 252 253 254 255 256 257 258
		} else
			continue;

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

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

		switch (value_list) {
		case 0:
259
			add_url_alias(remote, xstrdup(s));
260 261 262 263
			break;
		case 1:
			add_push_refspec(remote, xstrdup(s));
			break;
264 265 266
		case 2:
			add_fetch_refspec(remote, xstrdup(s));
			break;
267 268 269 270 271 272 273 274
		}
	}
	fclose(f);
}

static void read_branches_file(struct remote *remote)
{
	const char *slash = strchr(remote->name, '/');
275
	char *frag;
276
	struct strbuf branch = STRBUF_INIT;
277 278 279 280 281 282 283 284 285 286 287 288 289 290 291
	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;
292
	remote->origin = REMOTE_BRANCHES;
293 294 295 296 297 298 299 300 301 302
	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);
303 304 305 306 307 308 309 310 311 312 313 314

	/*
	 * 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.
	 */
315 316 317
	frag = strchr(p, '#');
	if (frag) {
		*(frag++) = '\0';
318 319 320 321 322
		strbuf_addf(&branch, "refs/heads/%s", frag);
	} else
		strbuf_addstr(&branch, "refs/heads/master");
	if (!slash) {
		strbuf_addf(&branch, ":refs/heads/%s", remote->name);
323
	} else {
324 325
		strbuf_reset(&branch);
		strbuf_addstr(&branch, "HEAD:");
326
	}
327
	add_url_alias(remote, p);
328
	add_fetch_refspec(remote, strbuf_detach(&branch, NULL));
329 330 331 332 333 334 335 336 337 338
	/*
	 * 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");
339
	add_push_refspec(remote, strbuf_detach(&branch, NULL));
340
	remote->fetch_tags = 1; /* always auto-follow */
341 342
}

343
static int handle_config(const char *key, const char *value, void *cb)
344 345 346 347
{
	const char *name;
	const char *subkey;
	struct remote *remote;
348 349 350 351 352 353
	struct branch *branch;
	if (!prefixcmp(key, "branch.")) {
		name = key + 7;
		subkey = strrchr(name, '.');
		if (!subkey)
			return 0;
354
		branch = make_branch(name, subkey - name);
355
		if (!strcmp(subkey, ".remote")) {
356 357
			if (!value)
				return config_error_nonbool(key);
358
			branch->remote_name = xstrdup(value);
359
			if (branch == current_branch) {
360
				default_remote_name = branch->remote_name;
361 362
				explicit_default_remote_name = 1;
			}
363 364 365
		} else if (!strcmp(subkey, ".merge")) {
			if (!value)
				return config_error_nonbool(key);
366
			add_merge(branch, xstrdup(value));
367
		}
368
		return 0;
369
	}
370 371
	if (!prefixcmp(key, "url.")) {
		struct rewrite *rewrite;
372
		name = key + 4;
373 374 375 376
		subkey = strrchr(name, '.');
		if (!subkey)
			return 0;
		if (!strcmp(subkey, ".insteadof")) {
377 378 379 380 381 382
			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);
383 384 385 386 387
			if (!value)
				return config_error_nonbool(key);
			add_instead_of(rewrite, xstrdup(value));
		}
	}
388 389 390
	if (prefixcmp(key,  "remote."))
		return 0;
	name = key + 7;
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 485 486 487
		return;
	default_remote_name = xstrdup("origin");
	current_branch = NULL;
	head_ref = resolve_ref("HEAD", sha1, 0, &flag);
	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
 * We need to make sure the remote-tracking branches are well formed, but a
497 498 499 500 501 502 503
 * wildcard refspec in "struct refspec" must have a trailing slash. We
 * temporarily drop the trailing '/' while calling check_ref_format(),
 * and put it back.  The caller knows that a CHECK_REF_FORMAT_ONELEVEL
 * error return is Ok for a wildcard refspec.
 */
static int verify_refname(char *name, int is_glob)
{
D
Daniel Barkalow 已提交
504
	int result;
505 506

	result = check_ref_format(name);
D
Daniel Barkalow 已提交
507 508
	if (is_glob && result == CHECK_REF_FORMAT_WILDCARD)
		result = CHECK_REF_FORMAT_OK;
509 510 511
	return result;
}

512 513 514 515 516 517
/*
 * 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.
 */
518
static void free_refspecs(struct refspec *refspec, int nr_refspec)
519 520 521 522 523 524 525 526 527 528 529 530 531
{
	int i;

	if (!refspec)
		return;

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

532
static struct refspec *parse_refspec_internal(int nr_refspec, const char **refspec, int fetch, int verify)
533 534
{
	int i;
D
Daniel Barkalow 已提交
535
	int st;
536
	struct refspec *rs = xcalloc(sizeof(*rs), nr_refspec);
537

538
	for (i = 0; i < nr_refspec; i++) {
539
		size_t llen;
540 541 542
		int is_glob;
		const char *lhs, *rhs;

B
Benjamin Kramer 已提交
543
		is_glob = 0;
544 545 546

		lhs = refspec[i];
		if (*lhs == '+') {
547
			rs[i].force = 1;
548
			lhs++;
549
		}
550 551

		rhs = strrchr(lhs, ':');
552 553 554 555 556 557 558 559 560 561

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

562
		if (rhs) {
563
			size_t rlen = strlen(++rhs);
564
			is_glob = (1 <= rlen && strchr(rhs, '*'));
D
Daniel Barkalow 已提交
565
			rs[i].dst = xstrndup(rhs, rlen);
566
		}
D
Daniel Barkalow 已提交
567

568
		llen = (rhs ? (rhs - lhs - 1) : strlen(lhs));
569
		if (1 <= llen && memchr(lhs, '*', llen)) {
570 571 572 573 574
			if ((rhs && !is_glob) || (!rhs && fetch))
				goto invalid;
			is_glob = 1;
		} else if (rhs && is_glob) {
			goto invalid;
D
Daniel Barkalow 已提交
575
		}
576

577 578 579 580 581 582 583 584 585 586 587 588
		rs[i].pattern = is_glob;
		rs[i].src = xstrndup(lhs, llen);

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

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

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

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

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

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

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

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

696 697 698
struct remote *remote_get(const char *name)
{
	struct remote *ret;
699
	int name_given = 0;
700 701

	read_config();
702 703 704
	if (name)
		name_given = 1;
	else {
705
		name = default_remote_name;
706 707
		name_given = explicit_default_remote_name;
	}
708

709
	ret = make_remote(name, 0);
710
	if (valid_remote_nick(name)) {
711
		if (!valid_remote(ret))
712
			read_remotes_file(ret);
713
		if (!valid_remote(ret))
714 715
			read_branches_file(ret);
	}
716
	if (name_given && !valid_remote(ret))
717
		add_url_alias(ret, name);
718
	if (!valid_remote(ret))
719
		return NULL;
720 721
	ret->fetch = parse_fetch_refspec(ret->fetch_refspec_nr, ret->fetch_refspec);
	ret->push = parse_push_refspec(ret->push_refspec_nr, ret->push_refspec);
722 723
	return ret;
}
724

725 726 727 728 729 730 731 732 733 734 735
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;
}

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

755 756
void ref_remove_duplicates(struct ref *ref_map)
{
757
	struct string_list refs = STRING_LIST_INIT_NODUP;
758 759 760 761
	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;
762 763
		if (!ref_map->peer_ref)
			continue;
764

765
		item = string_list_lookup(&refs, ref_map->peer_ref->name);
766 767 768 769 770 771 772 773 774 775
		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);
776 777
			ref_map = prev; /* skip this; we freed it */
			continue;
778
		}
779

780
		item = string_list_insert(&refs, ref_map->peer_ref->name);
781
		item->util = ref_map;
782
	}
783
	string_list_clear(&refs, 0);
784 785
}

786
int remote_has_url(struct remote *remote, const char *url)
787 788
{
	int i;
789 790
	for (i = 0; i < remote->url_nr; i++) {
		if (!strcmp(remote->url[i], url))
791 792 793 794 795
			return 1;
	}
	return 0;
}

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

831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847
char *apply_refspecs(struct refspec *refspecs, int nr_refspec,
		     const char *name)
{
	int i;
	char *ret = NULL;
	for (i = 0; i < nr_refspec; i++) {
		struct refspec *refspec = refspecs + i;
		if (refspec->pattern) {
			if (match_name_with_pattern(refspec->src, name,
						    refspec->dst, &ret))
				return ret;
		} else if (!strcmp(refspec->src, name))
			return strdup(refspec->dst);
	}
	return NULL;
}

848 849
int remote_find_tracking(struct remote *remote, struct refspec *refspec)
{
850 851
	int find_src = refspec->src == NULL;
	char *needle, **result;
852
	int i;
853 854

	if (find_src) {
855
		if (!refspec->dst)
856 857 858 859 860 861 862 863
			return error("find_tracking: need either src or dst");
		needle = refspec->dst;
		result = &refspec->src;
	} else {
		needle = refspec->src;
		result = &refspec->dst;
	}

864 865
	for (i = 0; i < remote->fetch_refspec_nr; i++) {
		struct refspec *fetch = &remote->fetch[i];
866 867
		const char *key = find_src ? fetch->dst : fetch->src;
		const char *value = find_src ? fetch->src : fetch->dst;
868 869 870
		if (!fetch->dst)
			continue;
		if (fetch->pattern) {
871
			if (match_name_with_pattern(key, needle, value, result)) {
872 873 874
				refspec->force = fetch->force;
				return 0;
			}
875 876 877 878
		} else if (!strcmp(needle, key)) {
			*result = xstrdup(value);
			refspec->force = fetch->force;
			return 0;
879 880 881 882 883
		}
	}
	return -1;
}

R
René Scharfe 已提交
884 885 886 887 888 889 890 891 892 893
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;
}

894
struct ref *alloc_ref(const char *name)
895
{
896
	return alloc_ref_with_prefix("", 0, name);
897 898
}

J
Jeff King 已提交
899
struct ref *copy_ref(const struct ref *ref)
900
{
901 902 903 904 905 906 907 908 909 910 911 912
	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;
913 914
}

915 916 917 918 919 920 921 922 923 924 925 926
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;
}

927
static void free_ref(struct ref *ref)
928 929 930
{
	if (!ref)
		return;
931
	free_ref(ref->peer_ref);
932 933 934 935 936
	free(ref->remote_status);
	free(ref->symref);
	free(ref);
}

937 938 939 940 941
void free_refs(struct ref *ref)
{
	struct ref *next;
	while (ref) {
		next = ref->next;
942
		free_ref(ref);
943 944 945 946
		ref = next;
	}
}

947 948 949 950 951 952 953 954 955 956 957 958 959 960
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);

961
		if (!refname_match(pattern, name, ref_rev_parse_rules))
962 963 964 965 966 967 968 969 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
			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;
	}
}

1001
static void tail_link_ref(struct ref *ref, struct ref ***tail)
1002 1003
{
	**tail = ref;
1004 1005
	while (ref->next)
		ref = ref->next;
1006 1007 1008 1009 1010 1011 1012 1013 1014
	*tail = &ref->next;
}

static struct ref *try_explicit_object_name(const char *name)
{
	unsigned char sha1[20];
	struct ref *ref;

	if (!*name) {
1015
		ref = alloc_ref("(delete)");
1016 1017 1018 1019 1020
		hashclr(ref->new_sha1);
		return ref;
	}
	if (get_sha1(name, sha1))
		return NULL;
1021
	ref = alloc_ref(name);
1022 1023 1024 1025
	hashcpy(ref->new_sha1, sha1);
	return ref;
}

1026
static struct ref *make_linked_ref(const char *name, struct ref ***tail)
1027
{
1028
	struct ref *ret = alloc_ref(name);
1029 1030
	tail_link_ref(ret, tail);
	return ret;
1031
}
1032

1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052
static char *guess_ref(const char *name, struct ref *peer)
{
	struct strbuf buf = STRBUF_INIT;
	unsigned char sha1[20];

	const char *r = resolve_ref(peer->name, sha1, 1, NULL);
	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);
}

1053 1054
static int match_explicit(struct ref *src, struct ref *dst,
			  struct ref ***dst_tail,
1055
			  struct refspec *rs)
1056
{
1057
	struct ref *matched_src, *matched_dst;
1058
	int copy_src;
1059

1060
	const char *dst_value = rs->dst;
1061
	char *dst_guess;
1062

1063
	if (rs->pattern || rs->matching)
1064
		return 0;
1065

1066 1067 1068
	matched_src = matched_dst = NULL;
	switch (count_refspec_match(rs->src, src, &matched_src)) {
	case 1:
1069
		copy_src = 1;
1070 1071 1072 1073 1074 1075 1076
		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);
1077
		if (!matched_src)
1078
			return error("src refspec %s does not match any.", rs->src);
1079
		copy_src = 0;
1080 1081
		break;
	default:
1082
		return error("src refspec %s matches more than one.", rs->src);
1083
	}
1084

1085
	if (!dst_value) {
1086 1087 1088 1089 1090 1091 1092 1093 1094
		unsigned char sha1[20];
		int flag;

		dst_value = resolve_ref(matched_src->name, sha1, 1, &flag);
		if (!dst_value ||
		    ((flag & REF_ISSYMREF) &&
		     prefixcmp(dst_value, "refs/heads/")))
			die("%s cannot be resolved to branch.",
			    matched_src->name);
1095
	}
1096

1097 1098 1099 1100
	switch (count_refspec_match(dst_value, dst, &matched_dst)) {
	case 1:
		break;
	case 0:
1101
		if (!memcmp(dst_value, "refs/", 5))
1102
			matched_dst = make_linked_ref(dst_value, dst_tail);
1103
		else if ((dst_guess = guess_ref(dst_value, matched_src)))
1104
			matched_dst = make_linked_ref(dst_guess, dst_tail);
1105
		else
1106 1107 1108 1109 1110 1111
			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);
1112 1113
		break;
	default:
1114
		matched_dst = NULL;
1115 1116 1117 1118
		error("dst refspec %s matches more than one.",
		      dst_value);
		break;
	}
1119 1120 1121 1122
	if (!matched_dst)
		return -1;
	if (matched_dst->peer_ref)
		return error("dst ref %s receives from more than one src.",
1123 1124
		      matched_dst->name);
	else {
1125
		matched_dst->peer_ref = copy_src ? copy_ref(matched_src) : matched_src;
1126
		matched_dst->force = rs->force;
1127
	}
1128
	return 0;
1129 1130 1131 1132 1133 1134 1135 1136
}

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++)
1137 1138
		errs += match_explicit(src, dst, dst_tail, &rs[i]);
	return errs;
1139 1140
}

1141 1142 1143
static const struct refspec *check_pattern_match(const struct refspec *rs,
						 int rs_nr,
						 const struct ref *src)
1144 1145
{
	int i;
1146
	int matching_refs = -1;
1147
	for (i = 0; i < rs_nr; i++) {
1148 1149 1150 1151 1152 1153
		if (rs[i].matching &&
		    (matching_refs == -1 || rs[i].force)) {
			matching_refs = i;
			continue;
		}

1154 1155
		if (rs[i].pattern && match_name_with_pattern(rs[i].src, src->name,
							     NULL, NULL))
1156
			return rs + i;
1157
	}
1158 1159 1160 1161
	if (matching_refs != -1)
		return rs + matching_refs;
	else
		return NULL;
1162 1163
}

1164 1165 1166 1167 1168 1169 1170 1171
static struct ref **tail_ref(struct ref **head)
{
	struct ref **tail = head;
	while (*tail)
		tail = &((*tail)->next);
	return tail;
}

1172 1173 1174 1175 1176
/*
 * Note. This is used only by "push"; refspec matching rules for
 * push and fetch are subtly different, so do not try to reuse it
 * without thinking.
 */
1177
int match_refs(struct ref *src, struct ref **dst,
A
Andy Whitcroft 已提交
1178
	       int nr_refspec, const char **refspec, int flags)
1179
{
1180
	struct refspec *rs;
A
Andy Whitcroft 已提交
1181 1182
	int send_all = flags & MATCH_REFS_ALL;
	int send_mirror = flags & MATCH_REFS_MIRROR;
1183
	int errs;
1184
	static const char *default_refspec[] = { ":", NULL };
1185
	struct ref **dst_tail = tail_ref(dst);
1186

1187 1188 1189 1190 1191
	if (!nr_refspec) {
		nr_refspec = 1;
		refspec = default_refspec;
	}
	rs = parse_push_refspec(nr_refspec, (const char **) refspec);
1192
	errs = match_explicit_refs(src, *dst, &dst_tail, rs, nr_refspec);
1193 1194 1195 1196

	/* pick the remainder */
	for ( ; src; src = src->next) {
		struct ref *dst_peer;
1197 1198
		const struct refspec *pat = NULL;
		char *dst_name;
1199 1200
		if (src->peer_ref)
			continue;
1201 1202 1203 1204 1205 1206

		pat = check_pattern_match(rs, nr_refspec, src);
		if (!pat)
			continue;

		if (pat->matching) {
1207 1208 1209 1210 1211
			/*
			 * "matching refs"; traditionally we pushed everything
			 * including refs outside refs/heads/ hierarchy, but
			 * that does not make much sense these days.
			 */
1212 1213 1214
			if (!send_mirror && prefixcmp(src->name, "refs/heads/"))
				continue;
			dst_name = xstrdup(src->name);
1215

1216
		} else {
1217
			const char *dst_side = pat->dst ? pat->dst : pat->src;
1218 1219 1220
			if (!match_name_with_pattern(pat->src, src->name,
						     dst_side, &dst_name))
				die("Didn't think it matches any more");
1221
		}
1222
		dst_peer = find_ref_by_name(*dst, dst_name);
1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235
		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 已提交
1236

1237
			/* Create a new one and link it */
1238
			dst_peer = make_linked_ref(dst_name, &dst_tail);
1239 1240
			hashcpy(dst_peer->new_sha1, src->new_sha1);
		}
1241
		dst_peer->peer_ref = copy_ref(src);
1242
		dst_peer->force = pat->force;
1243 1244
	free_name:
		free(dst_name);
1245
	}
1246 1247
	if (errs)
		return -1;
1248 1249
	return 0;
}
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
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) {
		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;
		}

		/* This part determines what can overwrite what.
		 * The rules are:
		 *
		 * (0) you can always use --force or +A:B notation to
		 *     selectively force individual ref pairs.
		 *
		 * (1) if the old thing does not exist, it is OK.
		 *
		 * (2) if you do not have the old thing, you are not allowed
		 *     to overwrite it; you would not know what you are losing
		 *     otherwise.
		 *
		 * (3) if both new and old are commit-ish, and new is a
		 *     descendant of old, it is OK.
		 *
		 * (4) regardless of all of the above, removing :B is
		 *     always allowed.
		 */

		ref->nonfastforward =
			!ref->deletion &&
			!is_null_sha1(ref->old_sha1) &&
			(!has_sha1_file(ref->old_sha1)
			  || !ref_newer(ref->new_sha1, ref->old_sha1));

		if (ref->nonfastforward && !ref->force && !force_update) {
			ref->status = REF_STATUS_REJECT_NONFASTFORWARD;
			continue;
		}
	}
}

1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318
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]);
1319 1320 1321
				if (remote_find_tracking(ret->remote, ret->merge[i])
				    && !strcmp(ret->remote_name, "."))
					ret->merge[i]->dst = xstrdup(ret->merge_name[i]);
1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332
			}
		}
	}
	return ret;
}

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

1333 1334 1335
int branch_merge_matches(struct branch *branch,
		                 int i,
		                 const char *refname)
1336
{
1337
	if (!branch || i < 0 || i >= branch->merge_nr)
1338
		return 0;
1339
	return refname_match(branch->merge[i]->src, refname, ref_fetch_rules);
1340
}
1341

1342
static struct ref *get_expanded_map(const struct ref *remote_refs,
1343 1344
				    const struct refspec *refspec)
{
1345
	const struct ref *ref;
1346 1347 1348
	struct ref *ret = NULL;
	struct ref **tail = &ret;

1349
	char *expn_name;
1350 1351 1352 1353

	for (ref = remote_refs; ref; ref = ref->next) {
		if (strchr(ref->name, '^'))
			continue; /* a dereference item */
1354 1355
		if (match_name_with_pattern(refspec->src, ref->name,
					    refspec->dst, &expn_name)) {
1356 1357
			struct ref *cpy = copy_ref(ref);

1358 1359
			cpy->peer_ref = alloc_ref(expn_name);
			free(expn_name);
1360 1361 1362 1363 1364 1365 1366 1367 1368 1369
			if (refspec->force)
				cpy->peer_ref->force = 1;
			*tail = cpy;
			tail = &cpy->next;
		}
	}

	return ret;
}

1370
static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
1371
{
1372
	const struct ref *ref;
1373
	for (ref = refs; ref; ref = ref->next) {
1374
		if (refname_match(name, ref->name, ref_fetch_rules))
1375 1376 1377 1378 1379
			return ref;
	}
	return NULL;
}

1380
struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
1381
{
1382
	const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
1383 1384

	if (!ref)
1385
		return NULL;
1386 1387 1388 1389 1390 1391

	return copy_ref(ref);
}

static struct ref *get_local_ref(const char *name)
{
1392
	if (!name || name[0] == '\0')
1393 1394
		return NULL;

1395 1396
	if (!prefixcmp(name, "refs/"))
		return alloc_ref(name);
1397 1398 1399

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

R
René Scharfe 已提交
1403
	return alloc_ref_with_prefix("refs/heads/", 11, name);
1404 1405
}

1406
int get_fetch_map(const struct ref *remote_refs,
1407
		  const struct refspec *refspec,
1408 1409
		  struct ref ***tail,
		  int missing_ok)
1410
{
D
Daniel Barkalow 已提交
1411
	struct ref *ref_map, **rmp;
1412 1413 1414 1415

	if (refspec->pattern) {
		ref_map = get_expanded_map(remote_refs, refspec);
	} else {
1416 1417 1418 1419 1420 1421 1422 1423 1424 1425
		const char *name = refspec->src[0] ? refspec->src : "HEAD";

		ref_map = get_remote_ref(remote_refs, name);
		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;
		}
1426 1427
	}

D
Daniel Barkalow 已提交
1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441
	for (rmp = &ref_map; *rmp; ) {
		if ((*rmp)->peer_ref) {
			int st = check_ref_format((*rmp)->peer_ref->name + 5);
			if (st && st != CHECK_REF_FORMAT_ONELEVEL) {
				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);
1442 1443
	}

1444 1445
	if (ref_map)
		tail_link_ref(ref_map, tail);
1446 1447 1448

	return 0;
}
1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460

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

1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509
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;

	/* Both new and old must be commit-ish and new is descendant of
	 * 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;
}

1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536
/*
 * 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;
	if (!resolve_ref(base, sha1, 1, NULL))
		return 0;
1537
	theirs = lookup_commit_reference(sha1);
1538 1539 1540 1541 1542
	if (!theirs)
		return 0;

	if (!resolve_ref(branch->refname, sha1, 1, NULL))
		return 0;
1543
	ours = lookup_commit_reference(sha1);
1544 1545 1546 1547 1548 1549 1550
	if (!ours)
		return 0;

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

1551
	/* Run "rev-list --left-right ours...theirs" internally... */
1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578
	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)++;
	}
1579 1580 1581 1582

	/* clear object flags smudged by the above traversal */
	clear_commit_marks(ours, ALL_REV_FLAGS);
	clear_commit_marks(theirs, ALL_REV_FLAGS);
1583 1584 1585 1586 1587 1588 1589 1590 1591
	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;
1592
	const char *base;
1593 1594 1595 1596 1597

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

	base = branch->merge[0]->dst;
1598
	base = shorten_unambiguous_ref(base, 0);
1599
	if (!num_theirs)
1600
		strbuf_addf(sb, "Your branch is ahead of '%s' "
1601
			    "by %d commit%s.\n",
1602
			    base, num_ours, (num_ours == 1) ? "" : "s");
1603
	else if (!num_ours)
1604 1605
		strbuf_addf(sb, "Your branch is behind '%s' "
			    "by %d commit%s, "
1606
			    "and can be fast-forwarded.\n",
1607
			    base, num_theirs, (num_theirs == 1) ? "" : "s");
1608
	else
1609 1610 1611 1612
		strbuf_addf(sb, "Your branch and '%s' have diverged,\n"
			    "and have %d and %d different commit(s) each, "
			    "respectively.\n",
			    base, num_ours, num_theirs);
1613 1614
	return 1;
}
1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636

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 */
	if (check_ref_format(refname + 5))
		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)
{
1637
	struct ref *local_refs = NULL, **local_tail = &local_refs;
1638 1639 1640
	for_each_ref(one_local_ref, &local_tail);
	return local_refs;
}
J
Jay Soffian 已提交
1641

1642 1643 1644
struct ref *guess_remote_head(const struct ref *head,
			      const struct ref *refs,
			      int all)
J
Jay Soffian 已提交
1645 1646
{
	const struct ref *r;
1647 1648
	struct ref *list = NULL;
	struct ref **tail = &list;
J
Jay Soffian 已提交
1649

1650
	if (!head)
J
Jay Soffian 已提交
1651 1652
		return NULL;

1653 1654 1655 1656 1657 1658 1659 1660
	/*
	 * 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 已提交
1661
	/* If refs/heads/master could be right, it is. */
1662 1663 1664 1665 1666
	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 已提交
1667 1668

	/* Look for another ref that points there */
1669
	for (r = refs; r; r = r->next) {
1670 1671 1672
		if (r != head &&
		    !prefixcmp(r->name, "refs/heads/") &&
		    !hashcmp(r->old_sha1, head->old_sha1)) {
1673 1674 1675 1676 1677 1678
			*tail = copy_ref(r);
			tail = &((*tail)->next);
			if (!all)
				break;
		}
	}
J
Jay Soffian 已提交
1679

1680
	return list;
J
Jay Soffian 已提交
1681
}
1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708

struct stale_heads_info {
	struct remote *remote;
	struct string_list *ref_names;
	struct ref **stale_refs_tail;
};

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;
	struct refspec refspec;
	memset(&refspec, 0, sizeof(refspec));
	refspec.dst = (char *)refname;
	if (!remote_find_tracking(info->remote, &refspec)) {
		if (!((flags & REF_ISSYMREF) ||
		    string_list_has_string(info->ref_names, refspec.src))) {
			struct ref *ref = make_linked_ref(refname, &info->stale_refs_tail);
			hashcpy(ref->new_sha1, sha1);
		}
	}
	return 0;
}

struct ref *get_stale_heads(struct remote *remote, struct ref *fetch_map)
{
	struct ref *ref, *stale_refs = NULL;
1709
	struct string_list ref_names = STRING_LIST_INIT_NODUP;
1710 1711 1712 1713 1714
	struct stale_heads_info info;
	info.remote = remote;
	info.ref_names = &ref_names;
	info.stale_refs_tail = &stale_refs;
	for (ref = fetch_map; ref; ref = ref->next)
1715
		string_list_append(&ref_names, ref->name);
1716 1717 1718 1719 1720
	sort_string_list(&ref_names);
	for_each_ref(get_stale_heads_cb, &info);
	string_list_clear(&ref_names, 0);
	return stale_refs;
}