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

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

const struct refspec *tag_refspec = &s_tag_refspec;

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

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

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

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

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

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

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

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

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

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

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

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

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

114 115 116 117 118 119
static void add_pushurl(struct remote *remote, const char *pushurl)
{
	ALLOC_GROW(remote->pushurl, remote->pushurl_nr + 1, remote->pushurl_alloc);
	remote->pushurl[remote->pushurl_nr++] = pushurl;
}

120 121 122 123 124 125 126 127 128 129 130 131 132
static void add_pushurl_alias(struct remote *remote, const char *url)
{
	const char *pushurl = alias_url(url, &rewrites_push);
	if (pushurl != url)
		add_pushurl(remote, pushurl);
}

static void add_url_alias(struct remote *remote, const char *url)
{
	add_url(remote, alias_url(url, &rewrites));
	add_pushurl_alias(remote, url);
}

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

D
Daniel Barkalow 已提交
138 139 140 141 142
	for (i = 0; i < remotes_nr; i++) {
		if (len ? (!strncmp(name, remotes[i]->name, len) &&
			   !remotes[i]->name[len]) :
		    !strcmp(name, remotes[i]->name))
			return remotes[i];
143 144
	}

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

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

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

D
Daniel Barkalow 已提交
168 169 170 171 172
	for (i = 0; i < branches_nr; i++) {
		if (len ? (!strncmp(name, branches[i]->name, len) &&
			   !branches[i]->name[len]) :
		    !strcmp(name, branches[i]->name))
			return branches[i];
173 174
	}

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

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

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

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

203
	ALLOC_GROW(r->rewrite, r->rewrite_nr + 1, r->rewrite_alloc);
204
	ret = xcalloc(1, sizeof(struct rewrite));
205
	r->rewrite[r->rewrite_nr++] = ret;
206
	if (len) {
207
		ret->base = xstrndup(base, len);
208 209 210
		ret->baselen = len;
	}
	else {
211
		ret->base = xstrdup(base);
212 213
		ret->baselen = strlen(base);
	}
214 215 216 217 218 219
	return ret;
}

static void add_instead_of(struct rewrite *rewrite, const char *instead_of)
{
	ALLOC_GROW(rewrite->instead_of, rewrite->instead_of_nr + 1, rewrite->instead_of_alloc);
220 221 222
	rewrite->instead_of[rewrite->instead_of_nr].s = instead_of;
	rewrite->instead_of[rewrite->instead_of_nr].len = strlen(instead_of);
	rewrite->instead_of_nr++;
223 224
}

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

	if (!f)
		return;
231
	remote->origin = REMOTE_REMOTES;
232 233 234 235 236 237 238 239 240 241
	while (fgets(buffer, BUF_SIZE, f)) {
		int value_list;
		char *s, *p;

		if (!prefixcmp(buffer, "URL:")) {
			value_list = 0;
			s = buffer + 4;
		} else if (!prefixcmp(buffer, "Push:")) {
			value_list = 1;
			s = buffer + 5;
242 243 244
		} else if (!prefixcmp(buffer, "Pull:")) {
			value_list = 2;
			s = buffer + 5;
245 246 247 248 249 250 251 252 253 254 255 256 257 258
		} else
			continue;

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

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

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

static void read_branches_file(struct remote *remote)
{
	const char *slash = strchr(remote->name, '/');
275
	char *frag;
276
	struct strbuf branch = STRBUF_INIT;
277 278 279 280 281 282 283 284 285 286 287 288 289 290 291
	int n = slash ? slash - remote->name : 1000;
	FILE *f = fopen(git_path("branches/%.*s", n, remote->name), "r");
	char *s, *p;
	int len;

	if (!f)
		return;
	s = fgets(buffer, BUF_SIZE, f);
	fclose(f);
	if (!s)
		return;
	while (isspace(*s))
		s++;
	if (!*s)
		return;
292
	remote->origin = REMOTE_BRANCHES;
293 294 295 296 297 298 299 300 301 302
	p = s + strlen(s);
	while (isspace(p[-1]))
		*--p = 0;
	len = p - s;
	if (slash)
		len += strlen(slash);
	p = xmalloc(len + 1);
	strcpy(p, s);
	if (slash)
		strcat(p, slash);
303 304 305 306 307 308 309 310 311 312 313 314

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

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

457 458 459 460
static void alias_all_urls(void)
{
	int i, j;
	for (i = 0; i < remotes_nr; i++) {
461
		int add_pushurl_aliases;
462 463
		if (!remotes[i])
			continue;
464
		for (j = 0; j < remotes[i]->pushurl_nr; j++) {
465
			remotes[i]->pushurl[j] = alias_url(remotes[i]->pushurl[j], &rewrites);
466
		}
467 468 469 470 471 472
		add_pushurl_aliases = remotes[i]->pushurl_nr == 0;
		for (j = 0; j < remotes[i]->url_nr; j++) {
			if (add_pushurl_aliases)
				add_pushurl_alias(remotes[i], remotes[i]->url[j]);
			remotes[i]->url[j] = alias_url(remotes[i]->url[j], &rewrites);
		}
473 474 475
	}
}

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

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

	if (!refspec)
		return;

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

515
static struct refspec *parse_refspec_internal(int nr_refspec, const char **refspec, int fetch, int verify)
516 517 518
{
	int i;
	struct refspec *rs = xcalloc(sizeof(*rs), nr_refspec);
519

520
	for (i = 0; i < nr_refspec; i++) {
521
		size_t llen;
522 523
		int is_glob;
		const char *lhs, *rhs;
524
		int flags;
525

B
Benjamin Kramer 已提交
526
		is_glob = 0;
527 528 529

		lhs = refspec[i];
		if (*lhs == '+') {
530
			rs[i].force = 1;
531
			lhs++;
532
		}
533 534

		rhs = strrchr(lhs, ':');
535 536 537 538 539 540 541 542 543 544

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

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

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

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

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

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

635 636 637 638
int valid_fetch_refspec(const char *fetch_refspec_str)
{
	struct refspec *refspec;

639
	refspec = parse_refspec_internal(1, &fetch_refspec_str, 1, 1);
640
	free_refspecs(refspec, 1);
641 642 643
	return !!refspec;
}

644 645
struct refspec *parse_fetch_refspec(int nr_refspec, const char **refspec)
{
646
	return parse_refspec_internal(nr_refspec, refspec, 1, 0);
647 648
}

649
static struct refspec *parse_push_refspec(int nr_refspec, const char **refspec)
650
{
651
	return parse_refspec_internal(nr_refspec, refspec, 0, 0);
652 653
}

654 655 656 657 658 659 660 661 662 663
void free_refspec(int nr_refspec, struct refspec *refspec)
{
	int i;
	for (i = 0; i < nr_refspec; i++) {
		free(refspec[i].src);
		free(refspec[i].dst);
	}
	free(refspec);
}

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

671 672 673
struct remote *remote_get(const char *name)
{
	struct remote *ret;
674
	int name_given = 0;
675 676

	read_config();
677 678 679
	if (name)
		name_given = 1;
	else {
680
		name = default_remote_name;
681 682
		name_given = explicit_default_remote_name;
	}
683

684
	ret = make_remote(name, 0);
685
	if (valid_remote_nick(name)) {
686
		if (!valid_remote(ret))
687
			read_remotes_file(ret);
688
		if (!valid_remote(ret))
689 690
			read_branches_file(ret);
	}
691
	if (name_given && !valid_remote(ret))
692
		add_url_alias(ret, name);
693
	if (!valid_remote(ret))
694
		return NULL;
695 696
	ret->fetch = parse_fetch_refspec(ret->fetch_refspec_nr, ret->fetch_refspec);
	ret->push = parse_push_refspec(ret->push_refspec_nr, ret->push_refspec);
697 698
	return ret;
}
699

700 701 702 703 704 705 706 707 708 709 710
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;
}

711 712 713 714
int for_each_remote(each_remote_fn fn, void *priv)
{
	int i, result = 0;
	read_config();
D
Daniel Barkalow 已提交
715
	for (i = 0; i < remotes_nr && !result; i++) {
716 717 718 719
		struct remote *r = remotes[i];
		if (!r)
			continue;
		if (!r->fetch)
720 721
			r->fetch = parse_fetch_refspec(r->fetch_refspec_nr,
						       r->fetch_refspec);
722
		if (!r->push)
723 724
			r->push = parse_push_refspec(r->push_refspec_nr,
						     r->push_refspec);
725 726 727 728 729
		result = fn(r, priv);
	}
	return result;
}

730 731
void ref_remove_duplicates(struct ref *ref_map)
{
732
	struct string_list refs = STRING_LIST_INIT_NODUP;
733 734 735 736
	struct string_list_item *item = NULL;
	struct ref *prev = NULL, *next = NULL;
	for (; ref_map; prev = ref_map, ref_map = next) {
		next = ref_map->next;
737 738
		if (!ref_map->peer_ref)
			continue;
739

740
		item = string_list_lookup(&refs, ref_map->peer_ref->name);
741 742 743 744 745 746 747 748 749 750
		if (item) {
			if (strcmp(((struct ref *)item->util)->name,
				   ref_map->name))
				die("%s tracks both %s and %s",
				    ref_map->peer_ref->name,
				    ((struct ref *)item->util)->name,
				    ref_map->name);
			prev->next = ref_map->next;
			free(ref_map->peer_ref);
			free(ref_map);
751 752
			ref_map = prev; /* skip this; we freed it */
			continue;
753
		}
754

755
		item = string_list_insert(&refs, ref_map->peer_ref->name);
756
		item->util = ref_map;
757
	}
758
	string_list_clear(&refs, 0);
759 760
}

761
int remote_has_url(struct remote *remote, const char *url)
762 763
{
	int i;
764 765
	for (i = 0; i < remote->url_nr; i++) {
		if (!strcmp(remote->url[i], url))
766 767 768 769 770
			return 1;
	}
	return 0;
}

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

806
static int query_refspecs(struct refspec *refs, int ref_count, struct refspec *query)
807 808
{
	int i;
809
	int find_src = !query->src;
810

811 812
	if (find_src && !query->dst)
		return error("query_refspecs: need either src or dst");
813

814 815 816 817 818 819
	for (i = 0; i < ref_count; i++) {
		struct refspec *refspec = &refs[i];
		const char *key = find_src ? refspec->dst : refspec->src;
		const char *value = find_src ? refspec->src : refspec->dst;
		const char *needle = find_src ? query->dst : query->src;
		char **result = find_src ? &query->src : &query->dst;
820

821
		if (!refspec->dst)
822
			continue;
823
		if (refspec->pattern) {
824
			if (match_name_with_pattern(key, needle, value, result)) {
825
				query->force = refspec->force;
826 827
				return 0;
			}
828 829
		} else if (!strcmp(needle, key)) {
			*result = xstrdup(value);
830
			query->force = refspec->force;
831
			return 0;
832 833 834 835 836
		}
	}
	return -1;
}

837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855
char *apply_refspecs(struct refspec *refspecs, int nr_refspec,
		     const char *name)
{
	struct refspec query;

	memset(&query, 0, sizeof(struct refspec));
	query.src = (char *)name;

	if (query_refspecs(refspecs, nr_refspec, &query))
		return NULL;

	return query.dst;
}

int remote_find_tracking(struct remote *remote, struct refspec *refspec)
{
	return query_refspecs(remote->fetch, remote->fetch_refspec_nr, refspec);
}

R
René Scharfe 已提交
856 857 858 859 860 861 862 863 864 865
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;
}

866
struct ref *alloc_ref(const char *name)
867
{
868
	return alloc_ref_with_prefix("", 0, name);
869 870
}

J
Jeff King 已提交
871
struct ref *copy_ref(const struct ref *ref)
872
{
873 874 875 876 877 878 879 880 881 882 883 884
	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;
885 886
}

887 888 889 890 891 892 893 894 895 896 897 898
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;
}

899
static void free_ref(struct ref *ref)
900 901 902
{
	if (!ref)
		return;
903
	free_ref(ref->peer_ref);
904 905 906 907 908
	free(ref->remote_status);
	free(ref->symref);
	free(ref);
}

909 910 911 912 913
void free_refs(struct ref *ref)
{
	struct ref *next;
	while (ref) {
		next = ref->next;
914
		free_ref(ref);
915 916 917 918
		ref = next;
	}
}

919 920 921 922 923 924 925 926 927 928 929 930 931 932
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);

933
		if (!refname_match(pattern, name, ref_rev_parse_rules))
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 965 966 967 968 969 970 971 972
			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;
	}
}

973
static void tail_link_ref(struct ref *ref, struct ref ***tail)
974 975
{
	**tail = ref;
976 977
	while (ref->next)
		ref = ref->next;
978 979 980
	*tail = &ref->next;
}

981 982 983 984 985 986 987
static struct ref *alloc_delete_ref(void)
{
	struct ref *ref = alloc_ref("(delete)");
	hashclr(ref->new_sha1);
	return ref;
}

988 989 990 991 992
static struct ref *try_explicit_object_name(const char *name)
{
	unsigned char sha1[20];
	struct ref *ref;

993 994
	if (!*name)
		return alloc_delete_ref();
995 996
	if (get_sha1(name, sha1))
		return NULL;
997
	ref = alloc_ref(name);
998 999 1000 1001
	hashcpy(ref->new_sha1, sha1);
	return ref;
}

1002
static struct ref *make_linked_ref(const char *name, struct ref ***tail)
1003
{
1004
	struct ref *ret = alloc_ref(name);
1005 1006
	tail_link_ref(ret, tail);
	return ret;
1007
}
1008

1009 1010 1011 1012 1013
static char *guess_ref(const char *name, struct ref *peer)
{
	struct strbuf buf = STRBUF_INIT;
	unsigned char sha1[20];

1014
	const char *r = resolve_ref_unsafe(peer->name, sha1, 1, NULL);
1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028
	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);
}

1029 1030
static int match_explicit(struct ref *src, struct ref *dst,
			  struct ref ***dst_tail,
1031
			  struct refspec *rs)
1032
{
1033
	struct ref *matched_src, *matched_dst;
1034
	int copy_src;
1035

1036
	const char *dst_value = rs->dst;
1037
	char *dst_guess;
1038

1039
	if (rs->pattern || rs->matching)
1040
		return 0;
1041

1042 1043 1044
	matched_src = matched_dst = NULL;
	switch (count_refspec_match(rs->src, src, &matched_src)) {
	case 1:
1045
		copy_src = 1;
1046 1047 1048 1049 1050 1051 1052
		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);
1053
		if (!matched_src)
1054
			return error("src refspec %s does not match any.", rs->src);
1055
		copy_src = 0;
1056 1057
		break;
	default:
1058
		return error("src refspec %s matches more than one.", rs->src);
1059
	}
1060

1061
	if (!dst_value) {
1062 1063 1064
		unsigned char sha1[20];
		int flag;

1065
		dst_value = resolve_ref_unsafe(matched_src->name, sha1, 1, &flag);
1066 1067 1068 1069 1070
		if (!dst_value ||
		    ((flag & REF_ISSYMREF) &&
		     prefixcmp(dst_value, "refs/heads/")))
			die("%s cannot be resolved to branch.",
			    matched_src->name);
1071
	}
1072

1073 1074 1075 1076
	switch (count_refspec_match(dst_value, dst, &matched_dst)) {
	case 1:
		break;
	case 0:
1077
		if (!memcmp(dst_value, "refs/", 5))
1078
			matched_dst = make_linked_ref(dst_value, dst_tail);
1079
		else if ((dst_guess = guess_ref(dst_value, matched_src)))
1080
			matched_dst = make_linked_ref(dst_guess, dst_tail);
1081
		else
1082 1083 1084 1085 1086 1087
			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);
1088 1089
		break;
	default:
1090
		matched_dst = NULL;
1091 1092 1093 1094
		error("dst refspec %s matches more than one.",
		      dst_value);
		break;
	}
1095 1096 1097 1098
	if (!matched_dst)
		return -1;
	if (matched_dst->peer_ref)
		return error("dst ref %s receives from more than one src.",
1099 1100
		      matched_dst->name);
	else {
1101
		matched_dst->peer_ref = copy_src ? copy_ref(matched_src) : matched_src;
1102
		matched_dst->force = rs->force;
1103
	}
1104
	return 0;
1105 1106 1107 1108 1109 1110 1111 1112
}

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++)
1113 1114
		errs += match_explicit(src, dst, dst_tail, &rs[i]);
	return errs;
1115 1116
}

1117 1118
static char *get_ref_match(const struct refspec *rs, int rs_nr, const struct ref *ref,
		int send_mirror, const struct refspec **ret_pat)
1119
{
1120 1121
	const struct refspec *pat;
	char *name;
1122
	int i;
1123
	int matching_refs = -1;
1124
	for (i = 0; i < rs_nr; i++) {
1125 1126 1127 1128 1129 1130
		if (rs[i].matching &&
		    (matching_refs == -1 || rs[i].force)) {
			matching_refs = i;
			continue;
		}

1131 1132 1133 1134 1135 1136 1137
		if (rs[i].pattern) {
			const char *dst_side = rs[i].dst ? rs[i].dst : rs[i].src;
			if (match_name_with_pattern(rs[i].src, ref->name, dst_side, &name)) {
				matching_refs = i;
				break;
			}
		}
1138
	}
1139
	if (matching_refs == -1)
1140
		return NULL;
1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155

	pat = rs + matching_refs;
	if (pat->matching) {
		/*
		 * "matching refs"; traditionally we pushed everything
		 * including refs outside refs/heads/ hierarchy, but
		 * that does not make much sense these days.
		 */
		if (!send_mirror && prefixcmp(ref->name, "refs/heads/"))
			return NULL;
		name = xstrdup(ref->name);
	}
	if (ret_pat)
		*ret_pat = pat;
	return name;
1156 1157
}

1158 1159 1160 1161 1162 1163 1164 1165
static struct ref **tail_ref(struct ref **head)
{
	struct ref **tail = head;
	while (*tail)
		tail = &((*tail)->next);
	return tail;
}

1166
/*
1167 1168 1169 1170 1171 1172
 * Given the set of refs the local repository has, the set of refs the
 * remote repository has, and the refspec used for push, determine
 * what remote refs we will update and with what value by setting
 * peer_ref (which object is being pushed) and force (if the push is
 * forced) in elements of "dst". The function may add new elements to
 * dst (e.g. pushing to a new branch, done in match_explicit_refs).
1173
 */
1174 1175
int match_push_refs(struct ref *src, struct ref **dst,
		    int nr_refspec, const char **refspec, int flags)
1176
{
1177
	struct refspec *rs;
A
Andy Whitcroft 已提交
1178 1179
	int send_all = flags & MATCH_REFS_ALL;
	int send_mirror = flags & MATCH_REFS_MIRROR;
1180
	int errs;
1181
	static const char *default_refspec[] = { ":", NULL };
1182
	struct ref *ref, **dst_tail = tail_ref(dst);
1183

1184 1185 1186 1187 1188
	if (!nr_refspec) {
		nr_refspec = 1;
		refspec = default_refspec;
	}
	rs = parse_push_refspec(nr_refspec, (const char **) refspec);
1189
	errs = match_explicit_refs(src, *dst, &dst_tail, rs, nr_refspec);
1190 1191

	/* pick the remainder */
1192
	for (ref = src; ref; ref = ref->next) {
1193
		struct ref *dst_peer;
1194 1195
		const struct refspec *pat = NULL;
		char *dst_name;
1196

1197
		if (ref->peer_ref)
1198
			continue;
1199

1200 1201
		dst_name = get_ref_match(rs, nr_refspec, ref, send_mirror, &pat);
		if (!dst_name)
1202 1203
			continue;

1204
		dst_peer = find_ref_by_name(*dst, dst_name);
1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216
		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 已提交
1217

1218
			/* Create a new one and link it */
1219
			dst_peer = make_linked_ref(dst_name, &dst_tail);
1220
			hashcpy(dst_peer->new_sha1, ref->new_sha1);
1221
		}
1222
		dst_peer->peer_ref = copy_ref(ref);
1223
		dst_peer->force = pat->force;
1224 1225
	free_name:
		free(dst_name);
1226
	}
1227 1228
	if (errs)
		return -1;
1229 1230
	return 0;
}
1231

1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281
void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
	int force_update)
{
	struct ref *ref;

	for (ref = remote_refs; ref; ref = ref->next) {
		if (ref->peer_ref)
			hashcpy(ref->new_sha1, ref->peer_ref->new_sha1);
		else if (!send_mirror)
			continue;

		ref->deletion = is_null_sha1(ref->new_sha1);
		if (!ref->deletion &&
			!hashcmp(ref->old_sha1, ref->new_sha1)) {
			ref->status = REF_STATUS_UPTODATE;
			continue;
		}

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

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

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

1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299
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]);
1300 1301 1302
				if (remote_find_tracking(ret->remote, ret->merge[i])
				    && !strcmp(ret->remote_name, "."))
					ret->merge[i]->dst = xstrdup(ret->merge_name[i]);
1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313
			}
		}
	}
	return ret;
}

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

1314 1315 1316
int branch_merge_matches(struct branch *branch,
		                 int i,
		                 const char *refname)
1317
{
1318
	if (!branch || i < 0 || i >= branch->merge_nr)
1319
		return 0;
1320
	return refname_match(branch->merge[i]->src, refname, ref_fetch_rules);
1321
}
1322

1323
static struct ref *get_expanded_map(const struct ref *remote_refs,
1324 1325
				    const struct refspec *refspec)
{
1326
	const struct ref *ref;
1327 1328 1329
	struct ref *ret = NULL;
	struct ref **tail = &ret;

1330
	char *expn_name;
1331 1332 1333 1334

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

1339 1340
			cpy->peer_ref = alloc_ref(expn_name);
			free(expn_name);
1341 1342 1343 1344 1345 1346 1347 1348 1349 1350
			if (refspec->force)
				cpy->peer_ref->force = 1;
			*tail = cpy;
			tail = &cpy->next;
		}
	}

	return ret;
}

1351
static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
1352
{
1353
	const struct ref *ref;
1354
	for (ref = refs; ref; ref = ref->next) {
1355
		if (refname_match(name, ref->name, ref_fetch_rules))
1356 1357 1358 1359 1360
			return ref;
	}
	return NULL;
}

1361
struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
1362
{
1363
	const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
1364 1365

	if (!ref)
1366
		return NULL;
1367 1368 1369 1370 1371 1372

	return copy_ref(ref);
}

static struct ref *get_local_ref(const char *name)
{
1373
	if (!name || name[0] == '\0')
1374 1375
		return NULL;

1376 1377
	if (!prefixcmp(name, "refs/"))
		return alloc_ref(name);
1378 1379 1380

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

R
René Scharfe 已提交
1384
	return alloc_ref_with_prefix("refs/heads/", 11, name);
1385 1386
}

1387
int get_fetch_map(const struct ref *remote_refs,
1388
		  const struct refspec *refspec,
1389 1390
		  struct ref ***tail,
		  int missing_ok)
1391
{
D
Daniel Barkalow 已提交
1392
	struct ref *ref_map, **rmp;
1393 1394 1395 1396

	if (refspec->pattern) {
		ref_map = get_expanded_map(remote_refs, refspec);
	} else {
1397 1398 1399 1400 1401 1402 1403 1404 1405 1406
		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;
		}
1407 1408
	}

D
Daniel Barkalow 已提交
1409 1410
	for (rmp = &ref_map; *rmp; ) {
		if ((*rmp)->peer_ref) {
1411 1412
			if (check_refname_format((*rmp)->peer_ref->name + 5,
				REFNAME_ALLOW_ONELEVEL)) {
D
Daniel Barkalow 已提交
1413 1414 1415 1416 1417 1418 1419 1420 1421 1422
				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);
1423 1424
	}

1425 1426
	if (ref_map)
		tail_link_ref(ref_map, tail);
1427 1428 1429

	return 0;
}
1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441

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

1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490
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;
}

1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515
/*
 * 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;
1516
	if (read_ref(base, sha1))
1517
		return 0;
1518
	theirs = lookup_commit_reference(sha1);
1519 1520 1521
	if (!theirs)
		return 0;

1522
	if (read_ref(branch->refname, sha1))
1523
		return 0;
1524
	ours = lookup_commit_reference(sha1);
1525 1526 1527 1528 1529 1530 1531
	if (!ours)
		return 0;

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

1532
	/* Run "rev-list --left-right ours...theirs" internally... */
1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559
	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)++;
	}
1560 1561 1562 1563

	/* clear object flags smudged by the above traversal */
	clear_commit_marks(ours, ALL_REV_FLAGS);
	clear_commit_marks(theirs, ALL_REV_FLAGS);
1564 1565 1566 1567 1568 1569 1570 1571 1572
	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;
1573
	const char *base;
1574 1575 1576 1577 1578

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

	base = branch->merge[0]->dst;
1579
	base = shorten_unambiguous_ref(base, 0);
1580
	if (!num_theirs)
1581 1582 1583 1584 1585
		strbuf_addf(sb,
			Q_("Your branch is ahead of '%s' by %d commit.\n",
			   "Your branch is ahead of '%s' by %d commits.\n",
			   num_ours),
			base, num_ours);
1586
	else if (!num_ours)
1587 1588 1589 1590 1591 1592 1593
		strbuf_addf(sb,
			Q_("Your branch is behind '%s' by %d commit, "
			       "and can be fast-forwarded.\n",
			   "Your branch is behind '%s' by %d commits, "
			       "and can be fast-forwarded.\n",
			   num_theirs),
			base, num_theirs);
1594
	else
1595 1596 1597 1598 1599 1600 1601 1602 1603
		strbuf_addf(sb,
			Q_("Your branch and '%s' have diverged,\n"
			       "and have %d and %d different commit each, "
			       "respectively.\n",
			   "Your branch and '%s' have diverged,\n"
			       "and have %d and %d different commits each, "
			       "respectively.\n",
			   num_theirs),
			base, num_ours, num_theirs);
1604 1605
	return 1;
}
1606 1607 1608 1609 1610 1611 1612 1613

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 */
1614
	if (check_refname_format(refname + 5, 0))
1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627
		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)
{
1628
	struct ref *local_refs = NULL, **local_tail = &local_refs;
1629 1630 1631
	for_each_ref(one_local_ref, &local_tail);
	return local_refs;
}
J
Jay Soffian 已提交
1632

1633 1634 1635
struct ref *guess_remote_head(const struct ref *head,
			      const struct ref *refs,
			      int all)
J
Jay Soffian 已提交
1636 1637
{
	const struct ref *r;
1638 1639
	struct ref *list = NULL;
	struct ref **tail = &list;
J
Jay Soffian 已提交
1640

1641
	if (!head)
J
Jay Soffian 已提交
1642 1643
		return NULL;

1644 1645 1646 1647 1648 1649 1650 1651
	/*
	 * 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 已提交
1652
	/* If refs/heads/master could be right, it is. */
1653 1654 1655 1656 1657
	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 已提交
1658 1659

	/* Look for another ref that points there */
1660
	for (r = refs; r; r = r->next) {
1661 1662 1663
		if (r != head &&
		    !prefixcmp(r->name, "refs/heads/") &&
		    !hashcmp(r->old_sha1, head->old_sha1)) {
1664 1665 1666 1667 1668 1669
			*tail = copy_ref(r);
			tail = &((*tail)->next);
			if (!all)
				break;
		}
	}
J
Jay Soffian 已提交
1670

1671
	return list;
J
Jay Soffian 已提交
1672
}
1673 1674 1675 1676

struct stale_heads_info {
	struct string_list *ref_names;
	struct ref **stale_refs_tail;
1677 1678
	struct refspec *refs;
	int ref_count;
1679 1680 1681 1682 1683 1684
};

static int get_stale_heads_cb(const char *refname,
	const unsigned char *sha1, int flags, void *cb_data)
{
	struct stale_heads_info *info = cb_data;
1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700
	struct refspec query;
	memset(&query, 0, sizeof(struct refspec));
	query.dst = (char *)refname;

	if (query_refspecs(info->refs, info->ref_count, &query))
		return 0; /* No matches */

	/*
	 * If we did find a suitable refspec and it's not a symref and
	 * it's not in the list of refs that currently exist in that
	 * remote we consider it to be stale.
	 */
	if (!((flags & REF_ISSYMREF) ||
	      string_list_has_string(info->ref_names, query.src))) {
		struct ref *ref = make_linked_ref(refname, &info->stale_refs_tail);
		hashcpy(ref->new_sha1, sha1);
1701
	}
1702 1703

	free(query.src);
1704 1705 1706
	return 0;
}

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