remote.c 34.0 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,
14 15 16 17 18 19
	"refs/tags/",
	"refs/tags/"
};

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 42

static struct branch *current_branch;
static const char *default_remote_name;

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

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

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

	longest = NULL;
	longest_i = -1;
59 60 61 62
	for (i = 0; i < rewrite_nr; i++) {
		if (!rewrite[i])
			continue;
		for (j = 0; j < rewrite[i]->instead_of_nr; j++) {
63 64 65 66 67
			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;
68 69 70
			}
		}
	}
71 72 73
	if (!longest)
		return url;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

415 416 417 418 419 420 421 422 423 424 425 426
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]);
		}
	}
}

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

446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467
/*
 * 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)
{
	int result, len = -1;

	if (is_glob) {
		len = strlen(name);
		assert(name[len - 1] == '/');
		name[len - 1] = '\0';
	}
	result = check_ref_format(name);
	if (is_glob)
		name[len - 1] = '/';
	return result;
}

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

	if (!refspec)
		return;

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

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

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

499
		llen = is_glob = 0;
500 501 502

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

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

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

518
		if (rhs) {
519
			size_t rlen = strlen(++rhs);
520
			is_glob = (2 <= rlen && !strcmp(rhs + rlen - 2, "/*"));
521
			rs[i].dst = xstrndup(rhs, rlen - is_glob);
522
		}
D
Daniel Barkalow 已提交
523

524
		llen = (rhs ? (rhs - lhs - 1) : strlen(lhs));
525 526 527 528
		if (2 <= llen && !memcmp(lhs + llen - 2, "/*", 2)) {
			if ((rhs && !is_glob) || (!rhs && fetch))
				goto invalid;
			is_glob = 1;
529
			llen--;
530 531
		} else if (rhs && is_glob) {
			goto invalid;
D
Daniel Barkalow 已提交
532
		}
533

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

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

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

627 628
struct refspec *parse_fetch_refspec(int nr_refspec, const char **refspec)
{
629
	return parse_refspec_internal(nr_refspec, refspec, 1, 0);
630 631
}

632
static struct refspec *parse_push_refspec(int nr_refspec, const char **refspec)
633
{
634
	return parse_refspec_internal(nr_refspec, refspec, 0, 0);
635 636
}

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

644 645 646 647 648 649 650 651
struct remote *remote_get(const char *name)
{
	struct remote *ret;

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

667 668 669 670
int for_each_remote(each_remote_fn fn, void *priv)
{
	int i, result = 0;
	read_config();
D
Daniel Barkalow 已提交
671
	for (i = 0; i < remotes_nr && !result; i++) {
672 673 674 675
		struct remote *r = remotes[i];
		if (!r)
			continue;
		if (!r->fetch)
676 677
			r->fetch = parse_fetch_refspec(r->fetch_refspec_nr,
						       r->fetch_refspec);
678
		if (!r->push)
679 680
			r->push = parse_push_refspec(r->push_refspec_nr,
						     r->push_refspec);
681 682 683 684 685
		result = fn(r, priv);
	}
	return result;
}

686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712
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;
			}
		}
	}
}

713
int remote_has_url(struct remote *remote, const char *url)
714 715
{
	int i;
716 717
	for (i = 0; i < remote->url_nr; i++) {
		if (!strcmp(remote->url[i], url))
718 719 720 721 722 723 724
			return 1;
	}
	return 0;
}

int remote_find_tracking(struct remote *remote, struct refspec *refspec)
{
725 726
	int find_src = refspec->src == NULL;
	char *needle, **result;
727
	int i;
728 729

	if (find_src) {
730
		if (!refspec->dst)
731 732 733 734 735 736 737 738
			return error("find_tracking: need either src or dst");
		needle = refspec->dst;
		result = &refspec->src;
	} else {
		needle = refspec->src;
		result = &refspec->dst;
	}

739 740
	for (i = 0; i < remote->fetch_refspec_nr; i++) {
		struct refspec *fetch = &remote->fetch[i];
741 742
		const char *key = find_src ? fetch->dst : fetch->src;
		const char *value = find_src ? fetch->src : fetch->dst;
743 744 745
		if (!fetch->dst)
			continue;
		if (fetch->pattern) {
746
			if (!prefixcmp(needle, key)) {
747 748 749 750 751 752
				*result = xmalloc(strlen(value) +
						  strlen(needle) -
						  strlen(key) + 1);
				strcpy(*result, value);
				strcpy(*result + strlen(value),
				       needle + strlen(key));
753 754 755
				refspec->force = fetch->force;
				return 0;
			}
756 757 758 759
		} else if (!strcmp(needle, key)) {
			*result = xstrdup(value);
			refspec->force = fetch->force;
			return 0;
760 761 762 763 764
		}
	}
	return -1;
}

R
René Scharfe 已提交
765 766 767 768 769 770 771 772 773 774
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;
}

775
struct ref *alloc_ref(const char *name)
776
{
777
	return alloc_ref_with_prefix("", 0, name);
778 779
}

780
static struct ref *copy_ref(const struct ref *ref)
781 782 783 784 785 786 787
{
	struct ref *ret = xmalloc(sizeof(struct ref) + strlen(ref->name) + 1);
	memcpy(ret, ref, sizeof(struct ref) + strlen(ref->name) + 1);
	ret->next = NULL;
	return ret;
}

788 789 790 791 792 793 794 795 796 797 798 799
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;
}

800
static void free_ref(struct ref *ref)
801 802 803 804 805 806 807 808
{
	if (!ref)
		return;
	free(ref->remote_status);
	free(ref->symref);
	free(ref);
}

809 810 811 812 813
void free_refs(struct ref *ref)
{
	struct ref *next;
	while (ref) {
		next = ref->next;
814
		free(ref->peer_ref);
815
		free_ref(ref);
816 817 818 819
		ref = next;
	}
}

820 821 822 823 824 825 826 827 828 829 830 831 832 833
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);

834
		if (!refname_match(pattern, name, ref_rev_parse_rules))
835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873
			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;
	}
}

874
static void tail_link_ref(struct ref *ref, struct ref ***tail)
875 876
{
	**tail = ref;
877 878
	while (ref->next)
		ref = ref->next;
879 880 881 882 883 884 885 886 887
	*tail = &ref->next;
}

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

	if (!*name) {
888
		ref = alloc_ref("(delete)");
889 890 891 892 893
		hashclr(ref->new_sha1);
		return ref;
	}
	if (get_sha1(name, sha1))
		return NULL;
894
	ref = alloc_ref(name);
895 896 897 898
	hashcpy(ref->new_sha1, sha1);
	return ref;
}

899
static struct ref *make_linked_ref(const char *name, struct ref ***tail)
900
{
901
	struct ref *ret = alloc_ref(name);
902 903
	tail_link_ref(ret, tail);
	return ret;
904
}
905

906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925
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);
}

926 927
static int match_explicit(struct ref *src, struct ref *dst,
			  struct ref ***dst_tail,
928
			  struct refspec *rs)
929
{
930
	struct ref *matched_src, *matched_dst;
931

932
	const char *dst_value = rs->dst;
933
	char *dst_guess;
934

935
	if (rs->pattern || rs->matching)
936
		return 0;
937

938 939 940 941 942 943 944 945 946 947
	matched_src = matched_dst = NULL;
	switch (count_refspec_match(rs->src, src, &matched_src)) {
	case 1:
		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);
948
		if (!matched_src)
949
			return error("src refspec %s does not match any.", rs->src);
950 951
		break;
	default:
952
		return error("src refspec %s matches more than one.", rs->src);
953
	}
954

955
	if (!dst_value) {
956 957 958 959 960 961 962 963 964
		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);
965
	}
966

967 968 969 970
	switch (count_refspec_match(dst_value, dst, &matched_dst)) {
	case 1:
		break;
	case 0:
971
		if (!memcmp(dst_value, "refs/", 5))
972
			matched_dst = make_linked_ref(dst_value, dst_tail);
973 974
		else if((dst_guess = guess_ref(dst_value, matched_src)))
			matched_dst = make_linked_ref(dst_guess, dst_tail);
975
		else
976 977 978 979 980 981
			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);
982 983
		break;
	default:
984
		matched_dst = NULL;
985 986 987 988
		error("dst refspec %s matches more than one.",
		      dst_value);
		break;
	}
989 990 991 992
	if (!matched_dst)
		return -1;
	if (matched_dst->peer_ref)
		return error("dst ref %s receives from more than one src.",
993 994 995 996
		      matched_dst->name);
	else {
		matched_dst->peer_ref = matched_src;
		matched_dst->force = rs->force;
997
	}
998
	return 0;
999 1000 1001 1002 1003 1004 1005 1006
}

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++)
1007 1008
		errs += match_explicit(src, dst, dst_tail, &rs[i]);
	return errs;
1009 1010
}

1011 1012 1013
static const struct refspec *check_pattern_match(const struct refspec *rs,
						 int rs_nr,
						 const struct ref *src)
1014 1015
{
	int i;
1016
	int matching_refs = -1;
1017
	for (i = 0; i < rs_nr; i++) {
1018 1019 1020 1021 1022 1023
		if (rs[i].matching &&
		    (matching_refs == -1 || rs[i].force)) {
			matching_refs = i;
			continue;
		}

1024
		if (rs[i].pattern && !prefixcmp(src->name, rs[i].src))
1025
			return rs + i;
1026
	}
1027 1028 1029 1030
	if (matching_refs != -1)
		return rs + matching_refs;
	else
		return NULL;
1031 1032
}

1033 1034 1035 1036 1037
/*
 * 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.
 */
1038
int match_refs(struct ref *src, struct ref *dst, struct ref ***dst_tail,
A
Andy Whitcroft 已提交
1039
	       int nr_refspec, const char **refspec, int flags)
1040
{
1041
	struct refspec *rs;
A
Andy Whitcroft 已提交
1042 1043
	int send_all = flags & MATCH_REFS_ALL;
	int send_mirror = flags & MATCH_REFS_MIRROR;
1044
	static const char *default_refspec[] = { ":", 0 };
1045

1046 1047 1048 1049 1050
	if (!nr_refspec) {
		nr_refspec = 1;
		refspec = default_refspec;
	}
	rs = parse_push_refspec(nr_refspec, (const char **) refspec);
1051 1052
	if (match_explicit_refs(src, dst, dst_tail, rs, nr_refspec))
		return -1;
1053 1054 1055 1056

	/* pick the remainder */
	for ( ; src; src = src->next) {
		struct ref *dst_peer;
1057 1058
		const struct refspec *pat = NULL;
		char *dst_name;
1059 1060
		if (src->peer_ref)
			continue;
1061 1062 1063 1064 1065 1066

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

		if (pat->matching) {
1067 1068 1069 1070 1071
			/*
			 * "matching refs"; traditionally we pushed everything
			 * including refs outside refs/heads/ hierarchy, but
			 * that does not make much sense these days.
			 */
1072 1073 1074
			if (!send_mirror && prefixcmp(src->name, "refs/heads/"))
				continue;
			dst_name = xstrdup(src->name);
1075

1076
		} else {
1077 1078
			const char *dst_side = pat->dst ? pat->dst : pat->src;
			dst_name = xmalloc(strlen(dst_side) +
1079 1080
					   strlen(src->name) -
					   strlen(pat->src) + 2);
1081
			strcpy(dst_name, dst_side);
1082
			strcat(dst_name, src->name + strlen(pat->src));
1083
		}
1084
		dst_peer = find_ref_by_name(dst, dst_name);
1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097
		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 已提交
1098

1099
			/* Create a new one and link it */
1100
			dst_peer = make_linked_ref(dst_name, dst_tail);
1101 1102 1103
			hashcpy(dst_peer->new_sha1, src->new_sha1);
		}
		dst_peer->peer_ref = src;
1104
		dst_peer->force = pat->force;
1105 1106
	free_name:
		free(dst_name);
1107 1108 1109
	}
	return 0;
}
1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141

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]);
				remote_find_tracking(ret->remote,
						     ret->merge[i]);
			}
		}
	}
	return ret;
}

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

1142 1143 1144
int branch_merge_matches(struct branch *branch,
		                 int i,
		                 const char *refname)
1145
{
1146
	if (!branch || i < 0 || i >= branch->merge_nr)
1147
		return 0;
1148
	return refname_match(branch->merge[i]->src, refname, ref_fetch_rules);
1149
}
1150

1151
static struct ref *get_expanded_map(const struct ref *remote_refs,
1152 1153
				    const struct refspec *refspec)
{
1154
	const struct ref *ref;
1155 1156 1157 1158 1159 1160 1161 1162 1163 1164
	struct ref *ret = NULL;
	struct ref **tail = &ret;

	int remote_prefix_len = strlen(refspec->src);
	int local_prefix_len = strlen(refspec->dst);

	for (ref = remote_refs; ref; ref = ref->next) {
		if (strchr(ref->name, '^'))
			continue; /* a dereference item */
		if (!prefixcmp(ref->name, refspec->src)) {
1165
			const char *match;
1166 1167 1168
			struct ref *cpy = copy_ref(ref);
			match = ref->name + remote_prefix_len;

R
René Scharfe 已提交
1169 1170
			cpy->peer_ref = alloc_ref_with_prefix(refspec->dst,
					local_prefix_len, match);
1171 1172 1173 1174 1175 1176 1177 1178 1179 1180
			if (refspec->force)
				cpy->peer_ref->force = 1;
			*tail = cpy;
			tail = &cpy->next;
		}
	}

	return ret;
}

1181
static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
1182
{
1183
	const struct ref *ref;
1184
	for (ref = refs; ref; ref = ref->next) {
1185
		if (refname_match(name, ref->name, ref_fetch_rules))
1186 1187 1188 1189 1190
			return ref;
	}
	return NULL;
}

1191
struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
1192
{
1193
	const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
1194 1195

	if (!ref)
1196
		return NULL;
1197 1198 1199 1200 1201 1202 1203 1204 1205

	return copy_ref(ref);
}

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

1206 1207
	if (!prefixcmp(name, "refs/"))
		return alloc_ref(name);
1208 1209 1210

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

R
René Scharfe 已提交
1214
	return alloc_ref_with_prefix("refs/heads/", 11, name);
1215 1216
}

1217
int get_fetch_map(const struct ref *remote_refs,
1218
		  const struct refspec *refspec,
1219 1220
		  struct ref ***tail,
		  int missing_ok)
1221
{
D
Daniel Barkalow 已提交
1222
	struct ref *ref_map, **rmp;
1223 1224 1225 1226

	if (refspec->pattern) {
		ref_map = get_expanded_map(remote_refs, refspec);
	} else {
1227 1228 1229 1230 1231 1232 1233 1234 1235 1236
		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;
		}
1237 1238
	}

D
Daniel Barkalow 已提交
1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252
	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);
1253 1254
	}

1255 1256
	if (ref_map)
		tail_link_ref(ref_map, tail);
1257 1258 1259

	return 0;
}
1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271

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

1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320
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;
}

1321 1322 1323 1324 1325 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 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389
/*
 * 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;

	/* Run "rev-list --left-right ours...theirs" internally... */
	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)++;
	}
1390 1391 1392 1393

	/* clear object flags smudged by the above traversal */
	clear_commit_marks(ours, ALL_REV_FLAGS);
	clear_commit_marks(theirs, ALL_REV_FLAGS);
1394 1395 1396 1397 1398 1399 1400 1401 1402
	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;
1403
	const char *base;
1404 1405 1406 1407 1408 1409 1410 1411 1412

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

	base = branch->merge[0]->dst;
	if (!prefixcmp(base, "refs/remotes/")) {
		base += strlen("refs/remotes/");
	}
	if (!num_theirs)
1413
		strbuf_addf(sb, "Your branch is ahead of '%s' "
1414
			    "by %d commit%s.\n",
1415
			    base, num_ours, (num_ours == 1) ? "" : "s");
1416
	else if (!num_ours)
1417 1418
		strbuf_addf(sb, "Your branch is behind '%s' "
			    "by %d commit%s, "
1419
			    "and can be fast-forwarded.\n",
1420
			    base, num_theirs, (num_theirs == 1) ? "" : "s");
1421
	else
1422 1423 1424 1425
		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);
1426 1427
	return 1;
}
1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453

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)
{
	struct ref *local_refs, **local_tail = &local_refs;
	for_each_ref(one_local_ref, &local_tail);
	return local_refs;
}