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

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

const struct refspec *tag_refspec = &s_tag_refspec;

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

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

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

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

49
static struct rewrites rewrites;
50
static struct rewrites rewrites_push;
51

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

342
static int handle_config(const char *key, const char *value, void *cb)
343 344 345 346
{
	const char *name;
	const char *subkey;
	struct remote *remote;
347 348 349 350 351 352
	struct branch *branch;
	if (!prefixcmp(key, "branch.")) {
		name = key + 7;
		subkey = strrchr(name, '.');
		if (!subkey)
			return 0;
353
		branch = make_branch(name, subkey - name);
354
		if (!strcmp(subkey, ".remote")) {
355 356
			if (!value)
				return config_error_nonbool(key);
357
			branch->remote_name = xstrdup(value);
358
			if (branch == current_branch) {
359
				default_remote_name = branch->remote_name;
360 361
				explicit_default_remote_name = 1;
			}
362 363 364
		} else if (!strcmp(subkey, ".merge")) {
			if (!value)
				return config_error_nonbool(key);
365
			add_merge(branch, xstrdup(value));
366
		}
367
		return 0;
368
	}
369 370
	if (!prefixcmp(key, "url.")) {
		struct rewrite *rewrite;
371
		name = key + 4;
372 373 374 375
		subkey = strrchr(name, '.');
		if (!subkey)
			return 0;
		if (!strcmp(subkey, ".insteadof")) {
376 377 378 379 380 381
			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);
382 383 384 385 386
			if (!value)
				return config_error_nonbool(key);
			add_instead_of(rewrite, xstrdup(value));
		}
	}
387 388 389
	if (prefixcmp(key,  "remote."))
		return 0;
	name = key + 7;
390 391 392 393 394
	if (*name == '/') {
		warning("Config remote shorthand cannot begin with '/': %s",
			name);
		return 0;
	}
395 396
	subkey = strrchr(name, '.');
	if (!subkey)
397
		return 0;
398
	remote = make_remote(name, subkey - name);
399
	remote->origin = REMOTE_CONFIG;
400 401 402 403 404 405 406 407 408 409
	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);

	else if (!strcmp(subkey, ".url")) {
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
		add_url(remote, v);
410 411 412 413 414
	} else if (!strcmp(subkey, ".pushurl")) {
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
		add_pushurl(remote, v);
415
	} else if (!strcmp(subkey, ".push")) {
416 417 418 419
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
		add_push_refspec(remote, v);
420
	} else if (!strcmp(subkey, ".fetch")) {
421 422 423 424
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
		add_fetch_refspec(remote, v);
425
	} else if (!strcmp(subkey, ".receivepack")) {
426 427 428
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
429
		if (!remote->receivepack)
430
			remote->receivepack = v;
431 432
		else
			error("more than one receivepack given, using the first");
433
	} else if (!strcmp(subkey, ".uploadpack")) {
434 435 436
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
437
		if (!remote->uploadpack)
438
			remote->uploadpack = v;
439 440
		else
			error("more than one uploadpack given, using the first");
441 442 443
	} else if (!strcmp(subkey, ".tagopt")) {
		if (!strcmp(value, "--no-tags"))
			remote->fetch_tags = -1;
S
Sam Vilain 已提交
444
	} else if (!strcmp(subkey, ".proxy")) {
445 446 447
		return git_config_string((const char **)&remote->http_proxy,
					 key, value);
	}
448 449 450
	return 0;
}

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

470 471 472 473 474 475 476 477 478 479 480 481
static void read_config(void)
{
	unsigned char sha1[20];
	const char *head_ref;
	int flag;
	if (default_remote_name) // did this already
		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/")) {
482 483
		current_branch =
			make_branch(head_ref + strlen("refs/heads/"), 0);
484
	}
485
	git_config(handle_config, NULL);
486
	alias_all_urls();
487 488
}

489 490 491 492 493 494 495 496 497
/*
 * We need to make sure the tracking branches are well formed, but a
 * 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 已提交
498
	int result;
499 500

	result = check_ref_format(name);
D
Daniel Barkalow 已提交
501 502
	if (is_glob && result == CHECK_REF_FORMAT_WILDCARD)
		result = CHECK_REF_FORMAT_OK;
503 504 505
	return result;
}

506 507 508 509 510 511
/*
 * 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.
 */
512
static void free_refspecs(struct refspec *refspec, int nr_refspec)
513 514 515 516 517 518 519 520 521 522 523 524 525
{
	int i;

	if (!refspec)
		return;

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

526
static struct refspec *parse_refspec_internal(int nr_refspec, const char **refspec, int fetch, int verify)
527 528
{
	int i;
D
Daniel Barkalow 已提交
529
	int st;
530
	struct refspec *rs = xcalloc(sizeof(*rs), nr_refspec);
531

532
	for (i = 0; i < nr_refspec; i++) {
533
		size_t llen;
534 535 536
		int is_glob;
		const char *lhs, *rhs;

B
Benjamin Kramer 已提交
537
		is_glob = 0;
538 539 540

		lhs = refspec[i];
		if (*lhs == '+') {
541
			rs[i].force = 1;
542
			lhs++;
543
		}
544 545

		rhs = strrchr(lhs, ':');
546 547 548 549 550 551 552 553 554 555

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

556
		if (rhs) {
557
			size_t rlen = strlen(++rhs);
558
			is_glob = (1 <= rlen && strchr(rhs, '*'));
D
Daniel Barkalow 已提交
559
			rs[i].dst = xstrndup(rhs, rlen);
560
		}
D
Daniel Barkalow 已提交
561

562
		llen = (rhs ? (rhs - lhs - 1) : strlen(lhs));
563
		if (1 <= llen && memchr(lhs, '*', llen)) {
564 565 566 567 568
			if ((rhs && !is_glob) || (!rhs && fetch))
				goto invalid;
			is_glob = 1;
		} else if (rhs && is_glob) {
			goto invalid;
D
Daniel Barkalow 已提交
569
		}
570

571 572 573 574 575 576 577 578 579 580 581 582
		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 {
583
				st = verify_refname(rs[i].src, is_glob);
584 585 586 587 588
				if (st && st != CHECK_REF_FORMAT_ONELEVEL)
					goto invalid;
			}
			/*
			 * RHS
589
			 * - missing is ok, and is same as empty.
590 591 592 593 594 595 596 597
			 * - 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 {
598
				st = verify_refname(rs[i].dst, is_glob);
599 600 601 602 603 604 605 606 607 608 609 610 611 612
				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) {
613
				st = verify_refname(rs[i].src, is_glob);
614 615 616 617 618 619 620 621 622 623 624 625 626
				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) {
627
				st = verify_refname(rs[i].src, is_glob);
628 629 630 631 632
				if (st && st != CHECK_REF_FORMAT_ONELEVEL)
					goto invalid;
			} else if (!*rs[i].dst) {
				goto invalid;
			} else {
633
				st = verify_refname(rs[i].dst, is_glob);
634 635 636
				if (st && st != CHECK_REF_FORMAT_ONELEVEL)
					goto invalid;
			}
D
Daniel Barkalow 已提交
637
		}
638 639
	}
	return rs;
640 641

 invalid:
642
	if (verify) {
643 644 645 646 647 648
		/*
		 * 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);
649 650
		return NULL;
	}
651 652 653
	die("Invalid refspec '%s'", refspec[i]);
}

654 655 656 657 658 659
int valid_fetch_refspec(const char *fetch_refspec_str)
{
	const char *fetch_refspec[] = { fetch_refspec_str };
	struct refspec *refspec;

	refspec = parse_refspec_internal(1, fetch_refspec, 1, 1);
660
	free_refspecs(refspec, 1);
661 662 663
	return !!refspec;
}

664 665
struct refspec *parse_fetch_refspec(int nr_refspec, const char **refspec)
{
666
	return parse_refspec_internal(nr_refspec, refspec, 1, 0);
667 668
}

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

674 675
static int valid_remote_nick(const char *name)
{
676
	if (!name[0] || is_dot_or_dotdot(name))
677 678 679 680
		return 0;
	return !strchr(name, '/'); /* no slash */
}

681 682 683
struct remote *remote_get(const char *name)
{
	struct remote *ret;
684
	int name_given = 0;
685 686

	read_config();
687 688 689
	if (name)
		name_given = 1;
	else {
690
		name = default_remote_name;
691 692
		name_given = explicit_default_remote_name;
	}
693

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

710 711 712 713 714 715 716 717 718 719 720
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;
}

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

740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766
void ref_remove_duplicates(struct ref *ref_map)
{
	struct ref **posn;
	struct ref *next;
	for (; ref_map; ref_map = ref_map->next) {
		if (!ref_map->peer_ref)
			continue;
		posn = &ref_map->next;
		while (*posn) {
			if ((*posn)->peer_ref &&
			    !strcmp((*posn)->peer_ref->name,
				    ref_map->peer_ref->name)) {
				if (strcmp((*posn)->name, ref_map->name))
					die("%s tracks both %s and %s",
					    ref_map->peer_ref->name,
					    (*posn)->name, ref_map->name);
				next = (*posn)->next;
				free((*posn)->peer_ref);
				free(*posn);
				*posn = next;
			} else {
				posn = &(*posn)->next;
			}
		}
	}
}

767
int remote_has_url(struct remote *remote, const char *url)
768 769
{
	int i;
770 771
	for (i = 0; i < remote->url_nr; i++) {
		if (!strcmp(remote->url[i], url))
772 773 774 775 776
			return 1;
	}
	return 0;
}

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

812 813
int remote_find_tracking(struct remote *remote, struct refspec *refspec)
{
814 815
	int find_src = refspec->src == NULL;
	char *needle, **result;
816
	int i;
817 818

	if (find_src) {
819
		if (!refspec->dst)
820 821 822 823 824 825 826 827
			return error("find_tracking: need either src or dst");
		needle = refspec->dst;
		result = &refspec->src;
	} else {
		needle = refspec->src;
		result = &refspec->dst;
	}

828 829
	for (i = 0; i < remote->fetch_refspec_nr; i++) {
		struct refspec *fetch = &remote->fetch[i];
830 831
		const char *key = find_src ? fetch->dst : fetch->src;
		const char *value = find_src ? fetch->src : fetch->dst;
832 833 834
		if (!fetch->dst)
			continue;
		if (fetch->pattern) {
835
			if (match_name_with_pattern(key, needle, value, result)) {
836 837 838
				refspec->force = fetch->force;
				return 0;
			}
839 840 841 842
		} else if (!strcmp(needle, key)) {
			*result = xstrdup(value);
			refspec->force = fetch->force;
			return 0;
843 844 845 846 847
		}
	}
	return -1;
}

R
René Scharfe 已提交
848 849 850 851 852 853 854 855 856 857
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;
}

858
struct ref *alloc_ref(const char *name)
859
{
860
	return alloc_ref_with_prefix("", 0, name);
861 862
}

863
static struct ref *copy_ref(const struct ref *ref)
864
{
865 866 867 868 869 870 871 872 873 874 875 876
	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;
877 878
}

879 880 881 882 883 884 885 886 887 888 889 890
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;
}

891
static void free_ref(struct ref *ref)
892 893 894
{
	if (!ref)
		return;
895
	free_ref(ref->peer_ref);
896 897 898 899 900
	free(ref->remote_status);
	free(ref->symref);
	free(ref);
}

901 902 903 904 905
void free_refs(struct ref *ref)
{
	struct ref *next;
	while (ref) {
		next = ref->next;
906
		free_ref(ref);
907 908 909 910
		ref = next;
	}
}

911 912 913 914 915 916 917 918 919 920 921 922 923 924
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);

925
		if (!refname_match(pattern, name, ref_rev_parse_rules))
926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964
			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;
	}
}

965
static void tail_link_ref(struct ref *ref, struct ref ***tail)
966 967
{
	**tail = ref;
968 969
	while (ref->next)
		ref = ref->next;
970 971 972 973 974 975 976 977 978
	*tail = &ref->next;
}

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

	if (!*name) {
979
		ref = alloc_ref("(delete)");
980 981 982 983 984
		hashclr(ref->new_sha1);
		return ref;
	}
	if (get_sha1(name, sha1))
		return NULL;
985
	ref = alloc_ref(name);
986 987 988 989
	hashcpy(ref->new_sha1, sha1);
	return ref;
}

990
static struct ref *make_linked_ref(const char *name, struct ref ***tail)
991
{
992
	struct ref *ret = alloc_ref(name);
993 994
	tail_link_ref(ret, tail);
	return ret;
995
}
996

997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016
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);
}

1017 1018
static int match_explicit(struct ref *src, struct ref *dst,
			  struct ref ***dst_tail,
1019
			  struct refspec *rs)
1020
{
1021
	struct ref *matched_src, *matched_dst;
1022
	int copy_src;
1023

1024
	const char *dst_value = rs->dst;
1025
	char *dst_guess;
1026

1027
	if (rs->pattern || rs->matching)
1028
		return 0;
1029

1030 1031 1032
	matched_src = matched_dst = NULL;
	switch (count_refspec_match(rs->src, src, &matched_src)) {
	case 1:
1033
		copy_src = 1;
1034 1035 1036 1037 1038 1039 1040
		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);
1041
		if (!matched_src)
1042
			return error("src refspec %s does not match any.", rs->src);
1043
		copy_src = 0;
1044 1045
		break;
	default:
1046
		return error("src refspec %s matches more than one.", rs->src);
1047
	}
1048

1049
	if (!dst_value) {
1050 1051 1052 1053 1054 1055 1056 1057 1058
		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);
1059
	}
1060

1061 1062 1063 1064
	switch (count_refspec_match(dst_value, dst, &matched_dst)) {
	case 1:
		break;
	case 0:
1065
		if (!memcmp(dst_value, "refs/", 5))
1066
			matched_dst = make_linked_ref(dst_value, dst_tail);
1067
		else if ((dst_guess = guess_ref(dst_value, matched_src)))
1068
			matched_dst = make_linked_ref(dst_guess, dst_tail);
1069
		else
1070 1071 1072 1073 1074 1075
			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);
1076 1077
		break;
	default:
1078
		matched_dst = NULL;
1079 1080 1081 1082
		error("dst refspec %s matches more than one.",
		      dst_value);
		break;
	}
1083 1084 1085 1086
	if (!matched_dst)
		return -1;
	if (matched_dst->peer_ref)
		return error("dst ref %s receives from more than one src.",
1087 1088
		      matched_dst->name);
	else {
1089
		matched_dst->peer_ref = copy_src ? copy_ref(matched_src) : matched_src;
1090
		matched_dst->force = rs->force;
1091
	}
1092
	return 0;
1093 1094 1095 1096 1097 1098 1099 1100
}

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++)
1101 1102
		errs += match_explicit(src, dst, dst_tail, &rs[i]);
	return errs;
1103 1104
}

1105 1106 1107
static const struct refspec *check_pattern_match(const struct refspec *rs,
						 int rs_nr,
						 const struct ref *src)
1108 1109
{
	int i;
1110
	int matching_refs = -1;
1111
	for (i = 0; i < rs_nr; i++) {
1112 1113 1114 1115 1116 1117
		if (rs[i].matching &&
		    (matching_refs == -1 || rs[i].force)) {
			matching_refs = i;
			continue;
		}

1118 1119
		if (rs[i].pattern && match_name_with_pattern(rs[i].src, src->name,
							     NULL, NULL))
1120
			return rs + i;
1121
	}
1122 1123 1124 1125
	if (matching_refs != -1)
		return rs + matching_refs;
	else
		return NULL;
1126 1127
}

1128 1129 1130 1131 1132 1133 1134 1135
static struct ref **tail_ref(struct ref **head)
{
	struct ref **tail = head;
	while (*tail)
		tail = &((*tail)->next);
	return tail;
}

1136 1137 1138 1139 1140
/*
 * 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.
 */
1141
int match_refs(struct ref *src, struct ref **dst,
A
Andy Whitcroft 已提交
1142
	       int nr_refspec, const char **refspec, int flags)
1143
{
1144
	struct refspec *rs;
A
Andy Whitcroft 已提交
1145 1146
	int send_all = flags & MATCH_REFS_ALL;
	int send_mirror = flags & MATCH_REFS_MIRROR;
1147
	int errs;
1148
	static const char *default_refspec[] = { ":", NULL };
1149
	struct ref **dst_tail = tail_ref(dst);
1150

1151 1152 1153 1154 1155
	if (!nr_refspec) {
		nr_refspec = 1;
		refspec = default_refspec;
	}
	rs = parse_push_refspec(nr_refspec, (const char **) refspec);
1156
	errs = match_explicit_refs(src, *dst, &dst_tail, rs, nr_refspec);
1157 1158 1159 1160

	/* pick the remainder */
	for ( ; src; src = src->next) {
		struct ref *dst_peer;
1161 1162
		const struct refspec *pat = NULL;
		char *dst_name;
1163 1164
		if (src->peer_ref)
			continue;
1165 1166 1167 1168 1169 1170

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

		if (pat->matching) {
1171 1172 1173 1174 1175
			/*
			 * "matching refs"; traditionally we pushed everything
			 * including refs outside refs/heads/ hierarchy, but
			 * that does not make much sense these days.
			 */
1176 1177 1178
			if (!send_mirror && prefixcmp(src->name, "refs/heads/"))
				continue;
			dst_name = xstrdup(src->name);
1179

1180
		} else {
1181
			const char *dst_side = pat->dst ? pat->dst : pat->src;
1182 1183 1184
			if (!match_name_with_pattern(pat->src, src->name,
						     dst_side, &dst_name))
				die("Didn't think it matches any more");
1185
		}
1186
		dst_peer = find_ref_by_name(*dst, dst_name);
1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199
		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 已提交
1200

1201
			/* Create a new one and link it */
1202
			dst_peer = make_linked_ref(dst_name, &dst_tail);
1203 1204
			hashcpy(dst_peer->new_sha1, src->new_sha1);
		}
1205
		dst_peer->peer_ref = copy_ref(src);
1206
		dst_peer->force = pat->force;
1207 1208
	free_name:
		free(dst_name);
1209
	}
1210 1211
	if (errs)
		return -1;
1212 1213
	return 0;
}
1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232

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]);
1233 1234 1235
				if (remote_find_tracking(ret->remote, ret->merge[i])
				    && !strcmp(ret->remote_name, "."))
					ret->merge[i]->dst = xstrdup(ret->merge_name[i]);
1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246
			}
		}
	}
	return ret;
}

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

1247 1248 1249
int branch_merge_matches(struct branch *branch,
		                 int i,
		                 const char *refname)
1250
{
1251
	if (!branch || i < 0 || i >= branch->merge_nr)
1252
		return 0;
1253
	return refname_match(branch->merge[i]->src, refname, ref_fetch_rules);
1254
}
1255

1256
static struct ref *get_expanded_map(const struct ref *remote_refs,
1257 1258
				    const struct refspec *refspec)
{
1259
	const struct ref *ref;
1260 1261 1262
	struct ref *ret = NULL;
	struct ref **tail = &ret;

1263
	char *expn_name;
1264 1265 1266 1267

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

1272 1273
			cpy->peer_ref = alloc_ref(expn_name);
			free(expn_name);
1274 1275 1276 1277 1278 1279 1280 1281 1282 1283
			if (refspec->force)
				cpy->peer_ref->force = 1;
			*tail = cpy;
			tail = &cpy->next;
		}
	}

	return ret;
}

1284
static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
1285
{
1286
	const struct ref *ref;
1287
	for (ref = refs; ref; ref = ref->next) {
1288
		if (refname_match(name, ref->name, ref_fetch_rules))
1289 1290 1291 1292 1293
			return ref;
	}
	return NULL;
}

1294
struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
1295
{
1296
	const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
1297 1298

	if (!ref)
1299
		return NULL;
1300 1301 1302 1303 1304 1305

	return copy_ref(ref);
}

static struct ref *get_local_ref(const char *name)
{
1306
	if (!name || name[0] == '\0')
1307 1308
		return NULL;

1309 1310
	if (!prefixcmp(name, "refs/"))
		return alloc_ref(name);
1311 1312 1313

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

R
René Scharfe 已提交
1317
	return alloc_ref_with_prefix("refs/heads/", 11, name);
1318 1319
}

1320
int get_fetch_map(const struct ref *remote_refs,
1321
		  const struct refspec *refspec,
1322 1323
		  struct ref ***tail,
		  int missing_ok)
1324
{
D
Daniel Barkalow 已提交
1325
	struct ref *ref_map, **rmp;
1326 1327 1328 1329

	if (refspec->pattern) {
		ref_map = get_expanded_map(remote_refs, refspec);
	} else {
1330 1331 1332 1333 1334 1335 1336 1337 1338 1339
		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;
		}
1340 1341
	}

D
Daniel Barkalow 已提交
1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355
	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);
1356 1357
	}

1358 1359
	if (ref_map)
		tail_link_ref(ref_map, tail);
1360 1361 1362

	return 0;
}
1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374

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

1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423
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;
}

1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450
/*
 * 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;
1451
	theirs = lookup_commit_reference(sha1);
1452 1453 1454 1455 1456
	if (!theirs)
		return 0;

	if (!resolve_ref(branch->refname, sha1, 1, NULL))
		return 0;
1457
	ours = lookup_commit_reference(sha1);
1458 1459 1460 1461 1462 1463 1464
	if (!ours)
		return 0;

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

1465
	/* Run "rev-list --left-right ours...theirs" internally... */
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
	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)++;
	}
1493 1494 1495 1496

	/* clear object flags smudged by the above traversal */
	clear_commit_marks(ours, ALL_REV_FLAGS);
	clear_commit_marks(theirs, ALL_REV_FLAGS);
1497 1498 1499 1500 1501 1502 1503 1504 1505
	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;
1506
	const char *base;
1507 1508 1509 1510 1511

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

	base = branch->merge[0]->dst;
1512
	base = shorten_unambiguous_ref(base, 0);
1513
	if (!num_theirs)
1514
		strbuf_addf(sb, "Your branch is ahead of '%s' "
1515
			    "by %d commit%s.\n",
1516
			    base, num_ours, (num_ours == 1) ? "" : "s");
1517
	else if (!num_ours)
1518 1519
		strbuf_addf(sb, "Your branch is behind '%s' "
			    "by %d commit%s, "
1520
			    "and can be fast-forwarded.\n",
1521
			    base, num_theirs, (num_theirs == 1) ? "" : "s");
1522
	else
1523 1524 1525 1526
		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);
1527 1528
	return 1;
}
1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550

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)
{
1551
	struct ref *local_refs = NULL, **local_tail = &local_refs;
1552 1553 1554
	for_each_ref(one_local_ref, &local_tail);
	return local_refs;
}
J
Jay Soffian 已提交
1555

1556 1557 1558
struct ref *guess_remote_head(const struct ref *head,
			      const struct ref *refs,
			      int all)
J
Jay Soffian 已提交
1559 1560
{
	const struct ref *r;
1561 1562
	struct ref *list = NULL;
	struct ref **tail = &list;
J
Jay Soffian 已提交
1563

1564
	if (!head)
J
Jay Soffian 已提交
1565 1566
		return NULL;

1567 1568 1569 1570 1571 1572 1573 1574
	/*
	 * 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 已提交
1575
	/* If refs/heads/master could be right, it is. */
1576 1577 1578 1579 1580
	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 已提交
1581 1582

	/* Look for another ref that points there */
1583 1584 1585 1586 1587 1588 1589 1590
	for (r = refs; r; r = r->next) {
		if (r != head && !hashcmp(r->old_sha1, head->old_sha1)) {
			*tail = copy_ref(r);
			tail = &((*tail)->next);
			if (!all)
				break;
		}
	}
J
Jay Soffian 已提交
1591

1592
	return list;
J
Jay Soffian 已提交
1593
}