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

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 31
	int instead_of_nr;
	int instead_of_alloc;
};

32
static struct remote **remotes;
D
Daniel Barkalow 已提交
33 34
static int remotes_alloc;
static int remotes_nr;
35

36
static struct branch **branches;
D
Daniel Barkalow 已提交
37 38
static int branches_alloc;
static int branches_nr;
39 40 41

static struct branch *current_branch;
static const char *default_remote_name;
42
static int explicit_default_remote_name;
43

44 45 46 47
static struct rewrite **rewrite;
static int rewrite_alloc;
static int rewrite_nr;

48 49 50
#define BUF_SIZE (2048)
static char buffer[BUF_SIZE];

51 52 53
static const char *alias_url(const char *url)
{
	int i, j;
54 55 56 57 58 59
	char *ret;
	struct counted_string *longest;
	int longest_i;

	longest = NULL;
	longest_i = -1;
60 61 62 63
	for (i = 0; i < rewrite_nr; i++) {
		if (!rewrite[i])
			continue;
		for (j = 0; j < rewrite[i]->instead_of_nr; j++) {
64 65 66 67 68
			if (!prefixcmp(url, rewrite[i]->instead_of[j].s) &&
			    (!longest ||
			     longest->len < rewrite[i]->instead_of[j].len)) {
				longest = &(rewrite[i]->instead_of[j]);
				longest_i = i;
69 70 71
			}
		}
	}
72 73 74
	if (!longest)
		return url;

75
	ret = xmalloc(rewrite[longest_i]->baselen +
76 77 78 79
		     (strlen(url) - longest->len) + 1);
	strcpy(ret, rewrite[longest_i]->base);
	strcpy(ret + rewrite[longest_i]->baselen, url + longest->len);
	return ret;
80 81
}

82 83
static void add_push_refspec(struct remote *remote, const char *ref)
{
D
Daniel Barkalow 已提交
84 85 86 87
	ALLOC_GROW(remote->push_refspec,
		   remote->push_refspec_nr + 1,
		   remote->push_refspec_alloc);
	remote->push_refspec[remote->push_refspec_nr++] = ref;
88 89
}

90 91
static void add_fetch_refspec(struct remote *remote, const char *ref)
{
D
Daniel Barkalow 已提交
92 93 94 95
	ALLOC_GROW(remote->fetch_refspec,
		   remote->fetch_refspec_nr + 1,
		   remote->fetch_refspec_alloc);
	remote->fetch_refspec[remote->fetch_refspec_nr++] = ref;
96 97
}

98
static void add_url(struct remote *remote, const char *url)
99
{
D
Daniel Barkalow 已提交
100 101
	ALLOC_GROW(remote->url, remote->url_nr + 1, remote->url_alloc);
	remote->url[remote->url_nr++] = url;
102 103
}

104 105 106 107 108
static void add_url_alias(struct remote *remote, const char *url)
{
	add_url(remote, alias_url(url));
}

109 110
static struct remote *make_remote(const char *name, int len)
{
D
Daniel Barkalow 已提交
111 112
	struct remote *ret;
	int i;
113

D
Daniel Barkalow 已提交
114 115 116 117 118
	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];
119 120
	}

D
Daniel Barkalow 已提交
121 122 123
	ret = xcalloc(1, sizeof(struct remote));
	ALLOC_GROW(remotes, remotes_nr + 1, remotes_alloc);
	remotes[remotes_nr++] = ret;
124
	if (len)
D
Daniel Barkalow 已提交
125
		ret->name = xstrndup(name, len);
126
	else
D
Daniel Barkalow 已提交
127 128
		ret->name = xstrdup(name);
	return ret;
129 130
}

131 132
static void add_merge(struct branch *branch, const char *name)
{
D
Daniel Barkalow 已提交
133 134 135
	ALLOC_GROW(branch->merge_name, branch->merge_nr + 1,
		   branch->merge_alloc);
	branch->merge_name[branch->merge_nr++] = name;
136 137 138 139
}

static struct branch *make_branch(const char *name, int len)
{
D
Daniel Barkalow 已提交
140 141
	struct branch *ret;
	int i;
142 143
	char *refname;

D
Daniel Barkalow 已提交
144 145 146 147 148
	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];
149 150
	}

D
Daniel Barkalow 已提交
151 152 153
	ALLOC_GROW(branches, branches_nr + 1, branches_alloc);
	ret = xcalloc(1, sizeof(struct branch));
	branches[branches_nr++] = ret;
154
	if (len)
D
Daniel Barkalow 已提交
155
		ret->name = xstrndup(name, len);
156
	else
D
Daniel Barkalow 已提交
157
		ret->name = xstrdup(name);
158
	refname = xmalloc(strlen(name) + strlen("refs/heads/") + 1);
159
	strcpy(refname, "refs/heads/");
D
Daniel Barkalow 已提交
160 161
	strcpy(refname + strlen("refs/heads/"), ret->name);
	ret->refname = refname;
162

D
Daniel Barkalow 已提交
163
	return ret;
164 165
}

166 167 168 169 170 171
static struct rewrite *make_rewrite(const char *base, int len)
{
	struct rewrite *ret;
	int i;

	for (i = 0; i < rewrite_nr; i++) {
172 173 174 175
		if (len
		    ? (len == rewrite[i]->baselen &&
		       !strncmp(base, rewrite[i]->base, len))
		    : !strcmp(base, rewrite[i]->base))
176 177 178 179 180 181
			return rewrite[i];
	}

	ALLOC_GROW(rewrite, rewrite_nr + 1, rewrite_alloc);
	ret = xcalloc(1, sizeof(struct rewrite));
	rewrite[rewrite_nr++] = ret;
182
	if (len) {
183
		ret->base = xstrndup(base, len);
184 185 186
		ret->baselen = len;
	}
	else {
187
		ret->base = xstrdup(base);
188 189
		ret->baselen = strlen(base);
	}
190 191 192 193 194 195
	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);
196 197 198
	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++;
199 200
}

201 202 203 204 205 206
static void read_remotes_file(struct remote *remote)
{
	FILE *f = fopen(git_path("remotes/%s", remote->name), "r");

	if (!f)
		return;
207
	remote->origin = REMOTE_REMOTES;
208 209 210 211 212 213 214 215 216 217
	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;
218 219 220
		} else if (!prefixcmp(buffer, "Pull:")) {
			value_list = 2;
			s = buffer + 5;
221 222 223 224 225 226 227 228 229 230 231 232 233 234
		} else
			continue;

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

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

		switch (value_list) {
		case 0:
235
			add_url_alias(remote, xstrdup(s));
236 237 238 239
			break;
		case 1:
			add_push_refspec(remote, xstrdup(s));
			break;
240 241 242
		case 2:
			add_fetch_refspec(remote, xstrdup(s));
			break;
243 244 245 246 247 248 249 250
		}
	}
	fclose(f);
}

static void read_branches_file(struct remote *remote)
{
	const char *slash = strchr(remote->name, '/');
251
	char *frag;
252
	struct strbuf branch = STRBUF_INIT;
253 254 255 256 257 258 259 260 261 262 263 264 265 266 267
	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;
268
	remote->origin = REMOTE_BRANCHES;
269 270 271 272 273 274 275 276 277 278
	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);
279 280 281 282 283 284 285 286 287 288 289 290

	/*
	 * 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.
	 */
291 292 293
	frag = strchr(p, '#');
	if (frag) {
		*(frag++) = '\0';
294 295 296 297 298
		strbuf_addf(&branch, "refs/heads/%s", frag);
	} else
		strbuf_addstr(&branch, "refs/heads/master");
	if (!slash) {
		strbuf_addf(&branch, ":refs/heads/%s", remote->name);
299
	} else {
300 301
		strbuf_reset(&branch);
		strbuf_addstr(&branch, "HEAD:");
302
	}
303
	add_url_alias(remote, p);
304
	add_fetch_refspec(remote, strbuf_detach(&branch, 0));
305 306 307 308 309 310 311 312 313 314 315
	/*
	 * 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");
	add_push_refspec(remote, strbuf_detach(&branch, 0));
316
	remote->fetch_tags = 1; /* always auto-follow */
317 318
}

319
static int handle_config(const char *key, const char *value, void *cb)
320 321 322 323
{
	const char *name;
	const char *subkey;
	struct remote *remote;
324 325 326 327 328 329
	struct branch *branch;
	if (!prefixcmp(key, "branch.")) {
		name = key + 7;
		subkey = strrchr(name, '.');
		if (!subkey)
			return 0;
330
		branch = make_branch(name, subkey - name);
331
		if (!strcmp(subkey, ".remote")) {
332 333
			if (!value)
				return config_error_nonbool(key);
334
			branch->remote_name = xstrdup(value);
335
			if (branch == current_branch) {
336
				default_remote_name = branch->remote_name;
337 338
				explicit_default_remote_name = 1;
			}
339 340 341
		} else if (!strcmp(subkey, ".merge")) {
			if (!value)
				return config_error_nonbool(key);
342
			add_merge(branch, xstrdup(value));
343
		}
344
		return 0;
345
	}
346 347
	if (!prefixcmp(key, "url.")) {
		struct rewrite *rewrite;
348
		name = key + 4;
349 350 351 352 353 354 355 356 357 358
		subkey = strrchr(name, '.');
		if (!subkey)
			return 0;
		rewrite = make_rewrite(name, subkey - name);
		if (!strcmp(subkey, ".insteadof")) {
			if (!value)
				return config_error_nonbool(key);
			add_instead_of(rewrite, xstrdup(value));
		}
	}
359 360 361
	if (prefixcmp(key,  "remote."))
		return 0;
	name = key + 7;
362 363 364 365 366
	if (*name == '/') {
		warning("Config remote shorthand cannot begin with '/': %s",
			name);
		return 0;
	}
367 368 369 370
	subkey = strrchr(name, '.');
	if (!subkey)
		return error("Config with no key for remote %s", name);
	remote = make_remote(name, subkey - name);
371
	remote->origin = REMOTE_CONFIG;
372 373 374 375 376 377 378 379 380 381
	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);
382
	} else if (!strcmp(subkey, ".push")) {
383 384 385 386
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
		add_push_refspec(remote, v);
387
	} else if (!strcmp(subkey, ".fetch")) {
388 389 390 391
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
		add_fetch_refspec(remote, v);
392
	} else if (!strcmp(subkey, ".receivepack")) {
393 394 395
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
396
		if (!remote->receivepack)
397
			remote->receivepack = v;
398 399
		else
			error("more than one receivepack given, using the first");
400
	} else if (!strcmp(subkey, ".uploadpack")) {
401 402 403
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
404
		if (!remote->uploadpack)
405
			remote->uploadpack = v;
406 407
		else
			error("more than one uploadpack given, using the first");
408 409 410
	} else if (!strcmp(subkey, ".tagopt")) {
		if (!strcmp(value, "--no-tags"))
			remote->fetch_tags = -1;
S
Sam Vilain 已提交
411
	} else if (!strcmp(subkey, ".proxy")) {
412 413 414
		return git_config_string((const char **)&remote->http_proxy,
					 key, value);
	}
415 416 417
	return 0;
}

418 419 420 421 422 423 424 425 426 427 428 429
static void alias_all_urls(void)
{
	int i, j;
	for (i = 0; i < remotes_nr; i++) {
		if (!remotes[i])
			continue;
		for (j = 0; j < remotes[i]->url_nr; j++) {
			remotes[i]->url[j] = alias_url(remotes[i]->url[j]);
		}
	}
}

430 431 432 433 434 435 436 437 438 439 440 441
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/")) {
442 443
		current_branch =
			make_branch(head_ref + strlen("refs/heads/"), 0);
444
	}
445
	git_config(handle_config, NULL);
446
	alias_all_urls();
447 448
}

449 450 451 452 453 454 455 456 457
/*
 * 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 已提交
458
	int result;
459 460

	result = check_ref_format(name);
D
Daniel Barkalow 已提交
461 462
	if (is_glob && result == CHECK_REF_FORMAT_WILDCARD)
		result = CHECK_REF_FORMAT_OK;
463 464 465
	return result;
}

466 467 468 469 470 471
/*
 * 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.
 */
472
static void free_refspecs(struct refspec *refspec, int nr_refspec)
473 474 475 476 477 478 479 480 481 482 483 484 485
{
	int i;

	if (!refspec)
		return;

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

486
static struct refspec *parse_refspec_internal(int nr_refspec, const char **refspec, int fetch, int verify)
487 488
{
	int i;
D
Daniel Barkalow 已提交
489
	int st;
490
	struct refspec *rs = xcalloc(sizeof(*rs), nr_refspec);
491

492
	for (i = 0; i < nr_refspec; i++) {
493
		size_t llen;
494 495 496
		int is_glob;
		const char *lhs, *rhs;

B
Benjamin Kramer 已提交
497
		is_glob = 0;
498 499 500

		lhs = refspec[i];
		if (*lhs == '+') {
501
			rs[i].force = 1;
502
			lhs++;
503
		}
504 505

		rhs = strrchr(lhs, ':');
506 507 508 509 510 511 512 513 514 515

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

516
		if (rhs) {
517
			size_t rlen = strlen(++rhs);
518
			is_glob = (1 <= rlen && strchr(rhs, '*'));
D
Daniel Barkalow 已提交
519
			rs[i].dst = xstrndup(rhs, rlen);
520
		}
D
Daniel Barkalow 已提交
521

522
		llen = (rhs ? (rhs - lhs - 1) : strlen(lhs));
523
		if (1 <= llen && memchr(lhs, '*', llen)) {
524 525 526 527 528
			if ((rhs && !is_glob) || (!rhs && fetch))
				goto invalid;
			is_glob = 1;
		} else if (rhs && is_glob) {
			goto invalid;
D
Daniel Barkalow 已提交
529
		}
530

531 532 533 534 535 536 537 538 539 540 541 542
		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 {
543
				st = verify_refname(rs[i].src, is_glob);
544 545 546 547 548
				if (st && st != CHECK_REF_FORMAT_ONELEVEL)
					goto invalid;
			}
			/*
			 * RHS
549
			 * - missing is ok, and is same as empty.
550 551 552 553 554 555 556 557
			 * - 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 {
558
				st = verify_refname(rs[i].dst, is_glob);
559 560 561 562 563 564 565 566 567 568 569 570 571 572
				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) {
573
				st = verify_refname(rs[i].src, is_glob);
574 575 576 577 578 579 580 581 582 583 584 585 586
				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) {
587
				st = verify_refname(rs[i].src, is_glob);
588 589 590 591 592
				if (st && st != CHECK_REF_FORMAT_ONELEVEL)
					goto invalid;
			} else if (!*rs[i].dst) {
				goto invalid;
			} else {
593
				st = verify_refname(rs[i].dst, is_glob);
594 595 596
				if (st && st != CHECK_REF_FORMAT_ONELEVEL)
					goto invalid;
			}
D
Daniel Barkalow 已提交
597
		}
598 599
	}
	return rs;
600 601

 invalid:
602
	if (verify) {
603 604 605 606 607 608
		/*
		 * 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);
609 610
		return NULL;
	}
611 612 613
	die("Invalid refspec '%s'", refspec[i]);
}

614 615 616 617 618 619
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);
620
	free_refspecs(refspec, 1);
621 622 623
	return !!refspec;
}

624 625
struct refspec *parse_fetch_refspec(int nr_refspec, const char **refspec)
{
626
	return parse_refspec_internal(nr_refspec, refspec, 1, 0);
627 628
}

629
static struct refspec *parse_push_refspec(int nr_refspec, const char **refspec)
630
{
631
	return parse_refspec_internal(nr_refspec, refspec, 0, 0);
632 633
}

634 635
static int valid_remote_nick(const char *name)
{
636
	if (!name[0] || is_dot_or_dotdot(name))
637 638 639 640
		return 0;
	return !strchr(name, '/'); /* no slash */
}

641 642 643
struct remote *remote_get(const char *name)
{
	struct remote *ret;
644
	int name_given = 0;
645 646

	read_config();
647 648 649
	if (name)
		name_given = 1;
	else {
650
		name = default_remote_name;
651 652
		name_given = explicit_default_remote_name;
	}
653

654
	ret = make_remote(name, 0);
655
	if (valid_remote_nick(name)) {
656
		if (!ret->url)
657
			read_remotes_file(ret);
658
		if (!ret->url)
659 660
			read_branches_file(ret);
	}
661
	if (name_given && !ret->url)
662
		add_url_alias(ret, name);
663
	if (!ret->url)
664
		return NULL;
665 666
	ret->fetch = parse_fetch_refspec(ret->fetch_refspec_nr, ret->fetch_refspec);
	ret->push = parse_push_refspec(ret->push_refspec_nr, ret->push_refspec);
667 668
	return ret;
}
669

670 671 672 673 674 675 676 677 678 679 680
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;
}

681 682 683 684
int for_each_remote(each_remote_fn fn, void *priv)
{
	int i, result = 0;
	read_config();
D
Daniel Barkalow 已提交
685
	for (i = 0; i < remotes_nr && !result; i++) {
686 687 688 689
		struct remote *r = remotes[i];
		if (!r)
			continue;
		if (!r->fetch)
690 691
			r->fetch = parse_fetch_refspec(r->fetch_refspec_nr,
						       r->fetch_refspec);
692
		if (!r->push)
693 694
			r->push = parse_push_refspec(r->push_refspec_nr,
						     r->push_refspec);
695 696 697 698 699
		result = fn(r, priv);
	}
	return result;
}

700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726
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;
			}
		}
	}
}

727
int remote_has_url(struct remote *remote, const char *url)
728 729
{
	int i;
730 731
	for (i = 0; i < remote->url_nr; i++) {
		if (!strcmp(remote->url[i], url))
732 733 734 735 736
			return 1;
	}
	return 0;
}

737 738
static int match_name_with_pattern(const char *key, const char *name,
				   const char *value, char **result)
739
{
D
Daniel Barkalow 已提交
740 741
	const char *kstar = strchr(key, '*');
	size_t klen;
742 743
	size_t ksuffixlen;
	size_t namelen;
D
Daniel Barkalow 已提交
744 745 746 747
	int ret;
	if (!kstar)
		die("Key '%s' of pattern had no '*'", key);
	klen = kstar - key;
748 749 750 751
	ksuffixlen = strlen(kstar + 1);
	namelen = strlen(name);
	ret = !strncmp(name, key, klen) && namelen >= klen + ksuffixlen &&
		!memcmp(name + namelen - ksuffixlen, kstar + 1, ksuffixlen);
752
	if (ret && value) {
D
Daniel Barkalow 已提交
753 754
		const char *vstar = strchr(value, '*');
		size_t vlen;
755
		size_t vsuffixlen;
D
Daniel Barkalow 已提交
756 757 758
		if (!vstar)
			die("Value '%s' of pattern has no '*'", value);
		vlen = vstar - value;
759 760
		vsuffixlen = strlen(vstar + 1);
		*result = xmalloc(vlen + vsuffixlen +
761
				  strlen(name) -
762 763 764 765 766 767
				  klen - ksuffixlen + 1);
		strncpy(*result, value, vlen);
		strncpy(*result + vlen,
			name + klen, namelen - klen - ksuffixlen);
		strcpy(*result + vlen + namelen - klen - ksuffixlen,
		       vstar + 1);
768
	}
769 770 771
	return ret;
}

772 773
int remote_find_tracking(struct remote *remote, struct refspec *refspec)
{
774 775
	int find_src = refspec->src == NULL;
	char *needle, **result;
776
	int i;
777 778

	if (find_src) {
779
		if (!refspec->dst)
780 781 782 783 784 785 786 787
			return error("find_tracking: need either src or dst");
		needle = refspec->dst;
		result = &refspec->src;
	} else {
		needle = refspec->src;
		result = &refspec->dst;
	}

788 789
	for (i = 0; i < remote->fetch_refspec_nr; i++) {
		struct refspec *fetch = &remote->fetch[i];
790 791
		const char *key = find_src ? fetch->dst : fetch->src;
		const char *value = find_src ? fetch->src : fetch->dst;
792 793 794
		if (!fetch->dst)
			continue;
		if (fetch->pattern) {
795
			if (match_name_with_pattern(key, needle, value, result)) {
796 797 798
				refspec->force = fetch->force;
				return 0;
			}
799 800 801 802
		} else if (!strcmp(needle, key)) {
			*result = xstrdup(value);
			refspec->force = fetch->force;
			return 0;
803 804 805 806 807
		}
	}
	return -1;
}

R
René Scharfe 已提交
808 809 810 811 812 813 814 815 816 817
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;
}

818
struct ref *alloc_ref(const char *name)
819
{
820
	return alloc_ref_with_prefix("", 0, name);
821 822
}

823
static struct ref *copy_ref(const struct ref *ref)
824
{
825 826 827 828 829 830 831 832 833 834 835 836
	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;
837 838
}

839 840 841 842 843 844 845 846 847 848 849 850
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;
}

851
static void free_ref(struct ref *ref)
852 853 854
{
	if (!ref)
		return;
855
	free_ref(ref->peer_ref);
856 857 858 859 860
	free(ref->remote_status);
	free(ref->symref);
	free(ref);
}

861 862 863 864 865
void free_refs(struct ref *ref)
{
	struct ref *next;
	while (ref) {
		next = ref->next;
866
		free_ref(ref);
867 868 869 870
		ref = next;
	}
}

871 872 873 874 875 876 877 878 879 880 881 882 883 884
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);

885
		if (!refname_match(pattern, name, ref_rev_parse_rules))
886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924
			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;
	}
}

925
static void tail_link_ref(struct ref *ref, struct ref ***tail)
926 927
{
	**tail = ref;
928 929
	while (ref->next)
		ref = ref->next;
930 931 932 933 934 935 936 937 938
	*tail = &ref->next;
}

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

	if (!*name) {
939
		ref = alloc_ref("(delete)");
940 941 942 943 944
		hashclr(ref->new_sha1);
		return ref;
	}
	if (get_sha1(name, sha1))
		return NULL;
945
	ref = alloc_ref(name);
946 947 948 949
	hashcpy(ref->new_sha1, sha1);
	return ref;
}

950
static struct ref *make_linked_ref(const char *name, struct ref ***tail)
951
{
952
	struct ref *ret = alloc_ref(name);
953 954
	tail_link_ref(ret, tail);
	return ret;
955
}
956

957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976
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);
}

977 978
static int match_explicit(struct ref *src, struct ref *dst,
			  struct ref ***dst_tail,
979
			  struct refspec *rs)
980
{
981
	struct ref *matched_src, *matched_dst;
982
	int copy_src;
983

984
	const char *dst_value = rs->dst;
985
	char *dst_guess;
986

987
	if (rs->pattern || rs->matching)
988
		return 0;
989

990 991 992
	matched_src = matched_dst = NULL;
	switch (count_refspec_match(rs->src, src, &matched_src)) {
	case 1:
993
		copy_src = 1;
994 995 996 997 998 999 1000
		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);
1001
		if (!matched_src)
1002
			return error("src refspec %s does not match any.", rs->src);
1003
		copy_src = 0;
1004 1005
		break;
	default:
1006
		return error("src refspec %s matches more than one.", rs->src);
1007
	}
1008

1009
	if (!dst_value) {
1010 1011 1012 1013 1014 1015 1016 1017 1018
		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);
1019
	}
1020

1021 1022 1023 1024
	switch (count_refspec_match(dst_value, dst, &matched_dst)) {
	case 1:
		break;
	case 0:
1025
		if (!memcmp(dst_value, "refs/", 5))
1026
			matched_dst = make_linked_ref(dst_value, dst_tail);
1027 1028
		else if((dst_guess = guess_ref(dst_value, matched_src)))
			matched_dst = make_linked_ref(dst_guess, dst_tail);
1029
		else
1030 1031 1032 1033 1034 1035
			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);
1036 1037
		break;
	default:
1038
		matched_dst = NULL;
1039 1040 1041 1042
		error("dst refspec %s matches more than one.",
		      dst_value);
		break;
	}
1043 1044 1045 1046
	if (!matched_dst)
		return -1;
	if (matched_dst->peer_ref)
		return error("dst ref %s receives from more than one src.",
1047 1048
		      matched_dst->name);
	else {
1049
		matched_dst->peer_ref = copy_src ? copy_ref(matched_src) : matched_src;
1050
		matched_dst->force = rs->force;
1051
	}
1052
	return 0;
1053 1054 1055 1056 1057 1058 1059 1060
}

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++)
1061 1062
		errs += match_explicit(src, dst, dst_tail, &rs[i]);
	return errs;
1063 1064
}

1065 1066 1067
static const struct refspec *check_pattern_match(const struct refspec *rs,
						 int rs_nr,
						 const struct ref *src)
1068 1069
{
	int i;
1070
	int matching_refs = -1;
1071
	for (i = 0; i < rs_nr; i++) {
1072 1073 1074 1075 1076 1077
		if (rs[i].matching &&
		    (matching_refs == -1 || rs[i].force)) {
			matching_refs = i;
			continue;
		}

1078 1079
		if (rs[i].pattern && match_name_with_pattern(rs[i].src, src->name,
							     NULL, NULL))
1080
			return rs + i;
1081
	}
1082 1083 1084 1085
	if (matching_refs != -1)
		return rs + matching_refs;
	else
		return NULL;
1086 1087
}

1088 1089 1090 1091 1092
/*
 * 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.
 */
1093
int match_refs(struct ref *src, struct ref *dst, struct ref ***dst_tail,
A
Andy Whitcroft 已提交
1094
	       int nr_refspec, const char **refspec, int flags)
1095
{
1096
	struct refspec *rs;
A
Andy Whitcroft 已提交
1097 1098
	int send_all = flags & MATCH_REFS_ALL;
	int send_mirror = flags & MATCH_REFS_MIRROR;
1099
	int errs;
1100
	static const char *default_refspec[] = { ":", 0 };
1101

1102 1103 1104 1105 1106
	if (!nr_refspec) {
		nr_refspec = 1;
		refspec = default_refspec;
	}
	rs = parse_push_refspec(nr_refspec, (const char **) refspec);
1107
	errs = match_explicit_refs(src, dst, dst_tail, rs, nr_refspec);
1108 1109 1110 1111

	/* pick the remainder */
	for ( ; src; src = src->next) {
		struct ref *dst_peer;
1112 1113
		const struct refspec *pat = NULL;
		char *dst_name;
1114 1115
		if (src->peer_ref)
			continue;
1116 1117 1118 1119 1120 1121

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

		if (pat->matching) {
1122 1123 1124 1125 1126
			/*
			 * "matching refs"; traditionally we pushed everything
			 * including refs outside refs/heads/ hierarchy, but
			 * that does not make much sense these days.
			 */
1127 1128 1129
			if (!send_mirror && prefixcmp(src->name, "refs/heads/"))
				continue;
			dst_name = xstrdup(src->name);
1130

1131
		} else {
1132
			const char *dst_side = pat->dst ? pat->dst : pat->src;
1133 1134 1135
			if (!match_name_with_pattern(pat->src, src->name,
						     dst_side, &dst_name))
				die("Didn't think it matches any more");
1136
		}
1137
		dst_peer = find_ref_by_name(dst, dst_name);
1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150
		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 已提交
1151

1152
			/* Create a new one and link it */
1153
			dst_peer = make_linked_ref(dst_name, dst_tail);
1154 1155
			hashcpy(dst_peer->new_sha1, src->new_sha1);
		}
1156
		dst_peer->peer_ref = copy_ref(src);
1157
		dst_peer->force = pat->force;
1158 1159
	free_name:
		free(dst_name);
1160
	}
1161 1162
	if (errs)
		return -1;
1163 1164
	return 0;
}
1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183

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]);
1184 1185 1186
				if (remote_find_tracking(ret->remote, ret->merge[i])
				    && !strcmp(ret->remote_name, "."))
					ret->merge[i]->dst = xstrdup(ret->merge_name[i]);
1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197
			}
		}
	}
	return ret;
}

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

1198 1199 1200
int branch_merge_matches(struct branch *branch,
		                 int i,
		                 const char *refname)
1201
{
1202
	if (!branch || i < 0 || i >= branch->merge_nr)
1203
		return 0;
1204
	return refname_match(branch->merge[i]->src, refname, ref_fetch_rules);
1205
}
1206

1207
static struct ref *get_expanded_map(const struct ref *remote_refs,
1208 1209
				    const struct refspec *refspec)
{
1210
	const struct ref *ref;
1211 1212 1213
	struct ref *ret = NULL;
	struct ref **tail = &ret;

1214
	char *expn_name;
1215 1216 1217 1218

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

1223 1224
			cpy->peer_ref = alloc_ref(expn_name);
			free(expn_name);
1225 1226 1227 1228 1229 1230 1231 1232 1233 1234
			if (refspec->force)
				cpy->peer_ref->force = 1;
			*tail = cpy;
			tail = &cpy->next;
		}
	}

	return ret;
}

1235
static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
1236
{
1237
	const struct ref *ref;
1238
	for (ref = refs; ref; ref = ref->next) {
1239
		if (refname_match(name, ref->name, ref_fetch_rules))
1240 1241 1242 1243 1244
			return ref;
	}
	return NULL;
}

1245
struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
1246
{
1247
	const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
1248 1249

	if (!ref)
1250
		return NULL;
1251 1252 1253 1254 1255 1256 1257 1258 1259

	return copy_ref(ref);
}

static struct ref *get_local_ref(const char *name)
{
	if (!name)
		return NULL;

1260 1261
	if (!prefixcmp(name, "refs/"))
		return alloc_ref(name);
1262 1263 1264

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

R
René Scharfe 已提交
1268
	return alloc_ref_with_prefix("refs/heads/", 11, name);
1269 1270
}

1271
int get_fetch_map(const struct ref *remote_refs,
1272
		  const struct refspec *refspec,
1273 1274
		  struct ref ***tail,
		  int missing_ok)
1275
{
D
Daniel Barkalow 已提交
1276
	struct ref *ref_map, **rmp;
1277 1278 1279 1280

	if (refspec->pattern) {
		ref_map = get_expanded_map(remote_refs, refspec);
	} else {
1281 1282 1283 1284 1285 1286 1287 1288 1289 1290
		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;
		}
1291 1292
	}

D
Daniel Barkalow 已提交
1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306
	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);
1307 1308
	}

1309 1310
	if (ref_map)
		tail_link_ref(ref_map, tail);
1311 1312 1313

	return 0;
}
1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325

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

1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374
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;
}

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
/*
 * 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;
	theirs = lookup_commit(sha1);
	if (!theirs)
		return 0;

	if (!resolve_ref(branch->refname, sha1, 1, NULL))
		return 0;
	ours = lookup_commit(sha1);
	if (!ours)
		return 0;

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

1416
	/* Run "rev-list --no-merges --left-right ours...theirs" internally... */
1417 1418
	rev_argc = 0;
	rev_argv[rev_argc++] = NULL;
1419
	rev_argv[rev_argc++] = "--no-merges";
1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444
	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)++;
	}
1445 1446 1447 1448

	/* clear object flags smudged by the above traversal */
	clear_commit_marks(ours, ALL_REV_FLAGS);
	clear_commit_marks(theirs, ALL_REV_FLAGS);
1449 1450 1451 1452 1453 1454 1455 1456 1457
	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;
1458
	const char *base;
1459 1460 1461 1462 1463

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

	base = branch->merge[0]->dst;
1464
	base = shorten_unambiguous_ref(base, 0);
1465
	if (!num_theirs)
1466
		strbuf_addf(sb, "Your branch is ahead of '%s' "
1467
			    "by %d commit%s.\n",
1468
			    base, num_ours, (num_ours == 1) ? "" : "s");
1469
	else if (!num_ours)
1470 1471
		strbuf_addf(sb, "Your branch is behind '%s' "
			    "by %d commit%s, "
1472
			    "and can be fast-forwarded.\n",
1473
			    base, num_theirs, (num_theirs == 1) ? "" : "s");
1474
	else
1475 1476 1477 1478
		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);
1479 1480
	return 1;
}
1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502

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)
{
1503
	struct ref *local_refs = NULL, **local_tail = &local_refs;
1504 1505 1506
	for_each_ref(one_local_ref, &local_tail);
	return local_refs;
}
J
Jay Soffian 已提交
1507

1508 1509 1510
struct ref *guess_remote_head(const struct ref *head,
			      const struct ref *refs,
			      int all)
J
Jay Soffian 已提交
1511 1512
{
	const struct ref *r;
1513 1514
	struct ref *list = NULL;
	struct ref **tail = &list;
J
Jay Soffian 已提交
1515

1516
	if (!head)
J
Jay Soffian 已提交
1517 1518
		return NULL;

1519 1520 1521 1522 1523 1524 1525 1526
	/*
	 * 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 已提交
1527
	/* If refs/heads/master could be right, it is. */
1528 1529 1530 1531 1532
	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 已提交
1533 1534

	/* Look for another ref that points there */
1535 1536 1537 1538 1539 1540 1541 1542
	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 已提交
1543

1544
	return list;
J
Jay Soffian 已提交
1545
}