remote.c 44.1 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
#include "mergesort.h"
11

F
Felipe Contreras 已提交
12 13
enum map_direction { FROM_SRC, FROM_DST };

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

const struct refspec *tag_refspec = &s_tag_refspec;

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

41
static struct remote **remotes;
D
Daniel Barkalow 已提交
42 43
static int remotes_alloc;
static int remotes_nr;
44

45
static struct branch **branches;
D
Daniel Barkalow 已提交
46 47
static int branches_alloc;
static int branches_nr;
48 49 50

static struct branch *current_branch;
static const char *default_remote_name;
51
static int explicit_default_remote_name;
52

53
static struct rewrites rewrites;
54
static struct rewrites rewrites_push;
55

56 57 58
#define BUF_SIZE (2048)
static char buffer[BUF_SIZE];

59 60
static int valid_remote(const struct remote *remote)
{
61
	return (!!remote->url) || (!!remote->foreign_vcs);
62 63
}

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

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

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

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

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

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

117 118 119 120 121 122
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;
}

123 124 125 126 127 128 129 130 131 132 133 134 135
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);
}

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

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

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

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

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

D
Daniel Barkalow 已提交
171 172 173 174 175
	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];
176 177
	}

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

D
Daniel Barkalow 已提交
190
	return ret;
191 192
}

193
static struct rewrite *make_rewrite(struct rewrites *r, const char *base, int len)
194 195 196 197
{
	struct rewrite *ret;
	int i;

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

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

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

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

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

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

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

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

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

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

460 461 462 463
static void alias_all_urls(void)
{
	int i, j;
	for (i = 0; i < remotes_nr; i++) {
464
		int add_pushurl_aliases;
465 466
		if (!remotes[i])
			continue;
467
		for (j = 0; j < remotes[i]->pushurl_nr; j++) {
468
			remotes[i]->pushurl[j] = alias_url(remotes[i]->pushurl[j], &rewrites);
469
		}
470 471 472 473 474 475
		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);
		}
476 477 478
	}
}

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

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

	if (!refspec)
		return;

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

518
static struct refspec *parse_refspec_internal(int nr_refspec, const char **refspec, int fetch, int verify)
519 520 521
{
	int i;
	struct refspec *rs = xcalloc(sizeof(*rs), nr_refspec);
522

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

B
Benjamin Kramer 已提交
529
		is_glob = 0;
530 531 532

		lhs = refspec[i];
		if (*lhs == '+') {
533
			rs[i].force = 1;
534
			lhs++;
535
		}
536 537

		rhs = strrchr(lhs, ':');
538 539 540

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

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

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

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

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

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

633 634 635 636
int valid_fetch_refspec(const char *fetch_refspec_str)
{
	struct refspec *refspec;

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

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

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

652 653 654 655 656 657 658 659 660 661
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);
}

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

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

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

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

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

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

728 729
void ref_remove_duplicates(struct ref *ref_map)
{
730
	struct string_list refs = STRING_LIST_INIT_NODUP;
731 732 733 734
	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;
735 736
		if (!ref_map->peer_ref)
			continue;
737

738
		item = string_list_lookup(&refs, ref_map->peer_ref->name);
739 740 741 742 743 744 745 746 747 748
		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);
749 750
			ref_map = prev; /* skip this; we freed it */
			continue;
751
		}
752

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

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

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

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

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

812 813 814 815 816 817
	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;
818

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

835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853
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 已提交
854 855 856 857 858 859 860 861 862 863
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;
}

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

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

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

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

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

917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937
int ref_compare_name(const void *va, const void *vb)
{
	const struct ref *a = va, *b = vb;
	return strcmp(a->name, b->name);
}

static void *ref_list_get_next(const void *a)
{
	return ((const struct ref *)a)->next;
}

static void ref_list_set_next(void *a, void *next)
{
	((struct ref *)a)->next = next;
}

void sort_ref_list(struct ref **l, int (*cmp)(const void *, const void *))
{
	*l = llist_mergesort(*l, ref_list_get_next, ref_list_set_next, cmp);
}

938 939 940 941 942 943 944 945 946 947 948 949 950 951
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);

952
		if (!refname_match(pattern, name, ref_rev_parse_rules))
953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991
			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;
	}
}

992
static void tail_link_ref(struct ref *ref, struct ref ***tail)
993 994
{
	**tail = ref;
995 996
	while (ref->next)
		ref = ref->next;
997 998 999
	*tail = &ref->next;
}

1000 1001 1002 1003 1004 1005 1006
static struct ref *alloc_delete_ref(void)
{
	struct ref *ref = alloc_ref("(delete)");
	hashclr(ref->new_sha1);
	return ref;
}

1007 1008 1009 1010 1011
static struct ref *try_explicit_object_name(const char *name)
{
	unsigned char sha1[20];
	struct ref *ref;

1012 1013
	if (!*name)
		return alloc_delete_ref();
1014 1015
	if (get_sha1(name, sha1))
		return NULL;
1016
	ref = alloc_ref(name);
1017 1018 1019 1020
	hashcpy(ref->new_sha1, sha1);
	return ref;
}

1021
static struct ref *make_linked_ref(const char *name, struct ref ***tail)
1022
{
1023
	struct ref *ret = alloc_ref(name);
1024 1025
	tail_link_ref(ret, tail);
	return ret;
1026
}
1027

1028 1029 1030 1031 1032
static char *guess_ref(const char *name, struct ref *peer)
{
	struct strbuf buf = STRBUF_INIT;
	unsigned char sha1[20];

1033
	const char *r = resolve_ref_unsafe(peer->name, sha1, 1, NULL);
1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047
	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);
}

1048 1049
static int match_explicit(struct ref *src, struct ref *dst,
			  struct ref ***dst_tail,
1050
			  struct refspec *rs)
1051
{
1052
	struct ref *matched_src, *matched_dst;
1053
	int copy_src;
1054

1055
	const char *dst_value = rs->dst;
1056
	char *dst_guess;
1057

1058
	if (rs->pattern || rs->matching)
1059
		return 0;
1060

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

1080
	if (!dst_value) {
1081 1082 1083
		unsigned char sha1[20];
		int flag;

1084
		dst_value = resolve_ref_unsafe(matched_src->name, sha1, 1, &flag);
1085 1086 1087 1088 1089
		if (!dst_value ||
		    ((flag & REF_ISSYMREF) &&
		     prefixcmp(dst_value, "refs/heads/")))
			die("%s cannot be resolved to branch.",
			    matched_src->name);
1090
	}
1091

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

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

1139
static char *get_ref_match(const struct refspec *rs, int rs_nr, const struct ref *ref,
F
Felipe Contreras 已提交
1140
		int send_mirror, int direction, const struct refspec **ret_pat)
1141
{
1142 1143
	const struct refspec *pat;
	char *name;
1144
	int i;
1145
	int matching_refs = -1;
1146
	for (i = 0; i < rs_nr; i++) {
1147 1148 1149 1150 1151 1152
		if (rs[i].matching &&
		    (matching_refs == -1 || rs[i].force)) {
			matching_refs = i;
			continue;
		}

1153 1154
		if (rs[i].pattern) {
			const char *dst_side = rs[i].dst ? rs[i].dst : rs[i].src;
F
Felipe Contreras 已提交
1155 1156 1157 1158 1159 1160
			int match;
			if (direction == FROM_SRC)
				match = match_name_with_pattern(rs[i].src, ref->name, dst_side, &name);
			else
				match = match_name_with_pattern(dst_side, ref->name, rs[i].src, &name);
			if (match) {
1161 1162 1163 1164
				matching_refs = i;
				break;
			}
		}
1165
	}
1166
	if (matching_refs == -1)
1167
		return NULL;
1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182

	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;
1183 1184
}

1185 1186 1187 1188 1189 1190 1191 1192
static struct ref **tail_ref(struct ref **head)
{
	struct ref **tail = head;
	while (*tail)
		tail = &((*tail)->next);
	return tail;
}

1193
/*
1194 1195 1196 1197 1198 1199
 * 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).
1200
 */
1201 1202
int match_push_refs(struct ref *src, struct ref **dst,
		    int nr_refspec, const char **refspec, int flags)
1203
{
1204
	struct refspec *rs;
A
Andy Whitcroft 已提交
1205 1206
	int send_all = flags & MATCH_REFS_ALL;
	int send_mirror = flags & MATCH_REFS_MIRROR;
F
Felipe Contreras 已提交
1207
	int send_prune = flags & MATCH_REFS_PRUNE;
1208
	int errs;
1209
	static const char *default_refspec[] = { ":", NULL };
1210
	struct ref *ref, **dst_tail = tail_ref(dst);
1211

1212 1213 1214 1215 1216
	if (!nr_refspec) {
		nr_refspec = 1;
		refspec = default_refspec;
	}
	rs = parse_push_refspec(nr_refspec, (const char **) refspec);
1217
	errs = match_explicit_refs(src, *dst, &dst_tail, rs, nr_refspec);
1218 1219

	/* pick the remainder */
1220
	for (ref = src; ref; ref = ref->next) {
1221
		struct ref *dst_peer;
1222 1223
		const struct refspec *pat = NULL;
		char *dst_name;
1224

1225
		if (ref->peer_ref)
1226
			continue;
1227

F
Felipe Contreras 已提交
1228
		dst_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_SRC, &pat);
1229
		if (!dst_name)
1230 1231
			continue;

1232
		dst_peer = find_ref_by_name(*dst, dst_name);
1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244
		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 已提交
1245

1246
			/* Create a new one and link it */
1247
			dst_peer = make_linked_ref(dst_name, &dst_tail);
1248
			hashcpy(dst_peer->new_sha1, ref->new_sha1);
1249
		}
1250
		dst_peer->peer_ref = copy_ref(ref);
1251
		dst_peer->force = pat->force;
1252 1253
	free_name:
		free(dst_name);
1254
	}
F
Felipe Contreras 已提交
1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271
	if (send_prune) {
		/* check for missing refs on the remote */
		for (ref = *dst; ref; ref = ref->next) {
			char *src_name;

			if (ref->peer_ref)
				/* We're already sending something to this ref. */
				continue;

			src_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_DST, NULL);
			if (src_name) {
				if (!find_ref_by_name(src, src_name))
					ref->peer_ref = alloc_delete_ref();
				free(src_name);
			}
		}
	}
1272 1273
	if (errs)
		return -1;
1274 1275
	return 0;
}
1276

1277 1278
static inline int is_forwardable(struct ref* ref)
{
1279 1280
	struct object *o;

1281 1282 1283
	if (!prefixcmp(ref->name, "refs/tags/"))
		return 0;

1284 1285 1286 1287 1288
	/* old object must be a commit */
	o = parse_object(ref->old_sha1);
	if (!o || o->type != OBJ_COMMIT)
		return 0;

1289 1290 1291 1292 1293
	/* new object must be commit-ish */
	o = deref_tag(parse_object(ref->new_sha1), NULL, 0);
	if (!o || o->type != OBJ_COMMIT)
		return 0;

1294 1295 1296
	return 1;
}

1297 1298 1299 1300 1301 1302
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) {
1303 1304
		int force_ref_update = ref->force || force_update;

1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316
		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;
		}

C
Chris Rorvick 已提交
1317 1318 1319 1320
		/*
		 * The below logic determines whether an individual
		 * refspec A:B can be pushed.  The push will succeed
		 * if any of the following are true:
1321
		 *
C
Chris Rorvick 已提交
1322
		 * (1) the remote reference B does not exist
1323
		 *
C
Chris Rorvick 已提交
1324 1325
		 * (2) the remote reference B is being removed (i.e.,
		 *     pushing :B where no source is specified)
1326
		 *
C
Chris Rorvick 已提交
1327
		 * (3) the update meets all fast-forwarding criteria:
1328
		 *
C
Chris Rorvick 已提交
1329 1330 1331
		 *     (a) the destination is not under refs/tags/
		 *     (b) the old is a commit
		 *     (c) the new is a descendant of the old
1332
		 *
C
Chris Rorvick 已提交
1333 1334 1335 1336
		 *     NOTE: We must actually have the old object in
		 *     order to overwrite it in the remote reference,
		 *     and the new object must be commit-ish.  These are
		 *     implied by (b) and (c) respectively.
1337
		 *
C
Chris Rorvick 已提交
1338 1339
		 * (4) it is forced using the +A:B notation, or by
		 *     passing the --force argument
1340 1341
		 */

1342
		ref->not_forwardable = !is_forwardable(ref);
1343

1344
		ref->update =
1345
			!ref->deletion &&
1346
			!is_null_sha1(ref->old_sha1);
1347

1348 1349 1350 1351 1352
		if (ref->update) {
			ref->nonfastforward =
				!has_sha1_file(ref->old_sha1)
				  || !ref_newer(ref->new_sha1, ref->old_sha1);

1353 1354 1355 1356 1357 1358 1359
			if (ref->not_forwardable) {
				ref->requires_force = 1;
				if (!force_ref_update) {
					ref->status = REF_STATUS_REJECT_ALREADY_EXISTS;
					continue;
				}
			} else if (ref->nonfastforward) {
1360 1361 1362 1363 1364
				ref->requires_force = 1;
				if (!force_ref_update) {
					ref->status = REF_STATUS_REJECT_NONFASTFORWARD;
					continue;
				}
1365
			}
1366 1367 1368 1369
		}
	}
}

1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387
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]);
1388 1389 1390
				if (remote_find_tracking(ret->remote, ret->merge[i])
				    && !strcmp(ret->remote_name, "."))
					ret->merge[i]->dst = xstrdup(ret->merge_name[i]);
1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401
			}
		}
	}
	return ret;
}

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

1402 1403 1404
int branch_merge_matches(struct branch *branch,
		                 int i,
		                 const char *refname)
1405
{
1406
	if (!branch || i < 0 || i >= branch->merge_nr)
1407
		return 0;
1408
	return refname_match(branch->merge[i]->src, refname, ref_fetch_rules);
1409
}
1410

1411 1412 1413 1414 1415 1416 1417 1418 1419 1420
static int ignore_symref_update(const char *refname)
{
	unsigned char sha1[20];
	int flag;

	if (!resolve_ref_unsafe(refname, sha1, 0, &flag))
		return 0; /* non-existing refs are OK */
	return (flag & REF_ISSYMREF);
}

1421
static struct ref *get_expanded_map(const struct ref *remote_refs,
1422 1423
				    const struct refspec *refspec)
{
1424
	const struct ref *ref;
1425 1426 1427
	struct ref *ret = NULL;
	struct ref **tail = &ret;

1428
	char *expn_name;
1429 1430 1431 1432

	for (ref = remote_refs; ref; ref = ref->next) {
		if (strchr(ref->name, '^'))
			continue; /* a dereference item */
1433
		if (match_name_with_pattern(refspec->src, ref->name,
1434 1435
					    refspec->dst, &expn_name) &&
		    !ignore_symref_update(expn_name)) {
1436 1437
			struct ref *cpy = copy_ref(ref);

1438 1439
			cpy->peer_ref = alloc_ref(expn_name);
			free(expn_name);
1440 1441 1442 1443 1444 1445 1446 1447 1448 1449
			if (refspec->force)
				cpy->peer_ref->force = 1;
			*tail = cpy;
			tail = &cpy->next;
		}
	}

	return ret;
}

1450
static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
1451
{
1452
	const struct ref *ref;
1453
	for (ref = refs; ref; ref = ref->next) {
1454
		if (refname_match(name, ref->name, ref_fetch_rules))
1455 1456 1457 1458 1459
			return ref;
	}
	return NULL;
}

1460
struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
1461
{
1462
	const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
1463 1464

	if (!ref)
1465
		return NULL;
1466 1467 1468 1469 1470 1471

	return copy_ref(ref);
}

static struct ref *get_local_ref(const char *name)
{
1472
	if (!name || name[0] == '\0')
1473 1474
		return NULL;

1475 1476
	if (!prefixcmp(name, "refs/"))
		return alloc_ref(name);
1477 1478 1479

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

R
René Scharfe 已提交
1483
	return alloc_ref_with_prefix("refs/heads/", 11, name);
1484 1485
}

1486
int get_fetch_map(const struct ref *remote_refs,
1487
		  const struct refspec *refspec,
1488 1489
		  struct ref ***tail,
		  int missing_ok)
1490
{
D
Daniel Barkalow 已提交
1491
	struct ref *ref_map, **rmp;
1492 1493 1494 1495

	if (refspec->pattern) {
		ref_map = get_expanded_map(remote_refs, refspec);
	} else {
1496 1497 1498 1499 1500 1501 1502 1503 1504 1505
		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;
		}
1506 1507
	}

D
Daniel Barkalow 已提交
1508 1509
	for (rmp = &ref_map; *rmp; ) {
		if ((*rmp)->peer_ref) {
1510 1511
			if (prefixcmp((*rmp)->peer_ref->name, "refs/") ||
			    check_refname_format((*rmp)->peer_ref->name, 0)) {
D
Daniel Barkalow 已提交
1512 1513 1514 1515 1516 1517 1518 1519 1520 1521
				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);
1522 1523
	}

1524 1525
	if (ref_map)
		tail_link_ref(ref_map, tail);
1526 1527 1528

	return 0;
}
1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540

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

1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589
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;
}

1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614
/*
 * 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;
1615
	if (read_ref(base, sha1))
1616
		return 0;
1617
	theirs = lookup_commit_reference(sha1);
1618 1619 1620
	if (!theirs)
		return 0;

1621
	if (read_ref(branch->refname, sha1))
1622
		return 0;
1623
	ours = lookup_commit_reference(sha1);
1624 1625 1626 1627 1628 1629 1630
	if (!ours)
		return 0;

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

1631
	/* Run "rev-list --left-right ours...theirs" internally... */
1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658
	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)++;
	}
1659 1660 1661 1662

	/* clear object flags smudged by the above traversal */
	clear_commit_marks(ours, ALL_REV_FLAGS);
	clear_commit_marks(theirs, ALL_REV_FLAGS);
1663 1664 1665 1666 1667 1668 1669 1670 1671
	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;
1672
	const char *base;
1673 1674 1675 1676 1677

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

	base = branch->merge[0]->dst;
1678
	base = shorten_unambiguous_ref(base, 0);
1679
	if (!num_theirs) {
1680 1681 1682 1683 1684
		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);
1685 1686 1687
		if (advice_status_hints)
			strbuf_addf(sb,
				_("  (use \"git push\" to publish your local commits)\n"));
1688
	} else if (!num_ours) {
1689 1690 1691 1692 1693 1694 1695
		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);
1696 1697 1698
		if (advice_status_hints)
			strbuf_addf(sb,
				_("  (use \"git pull\" to update your local branch)\n"));
1699
	} else {
1700 1701 1702 1703 1704 1705 1706 1707 1708
		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);
1709 1710 1711
		if (advice_status_hints)
			strbuf_addf(sb,
				_("  (use \"git pull\" to merge the remote branch into yours)\n"));
1712
	}
1713 1714
	return 1;
}
1715 1716 1717 1718 1719 1720 1721 1722

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 */
1723
	if (check_refname_format(refname + 5, 0))
1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736
		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)
{
1737
	struct ref *local_refs = NULL, **local_tail = &local_refs;
1738 1739 1740
	for_each_ref(one_local_ref, &local_tail);
	return local_refs;
}
J
Jay Soffian 已提交
1741

1742 1743 1744
struct ref *guess_remote_head(const struct ref *head,
			      const struct ref *refs,
			      int all)
J
Jay Soffian 已提交
1745 1746
{
	const struct ref *r;
1747 1748
	struct ref *list = NULL;
	struct ref **tail = &list;
J
Jay Soffian 已提交
1749

1750
	if (!head)
J
Jay Soffian 已提交
1751 1752
		return NULL;

1753 1754 1755 1756 1757 1758 1759 1760
	/*
	 * 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 已提交
1761
	/* If refs/heads/master could be right, it is. */
1762 1763 1764 1765 1766
	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 已提交
1767 1768

	/* Look for another ref that points there */
1769
	for (r = refs; r; r = r->next) {
1770 1771 1772
		if (r != head &&
		    !prefixcmp(r->name, "refs/heads/") &&
		    !hashcmp(r->old_sha1, head->old_sha1)) {
1773 1774 1775 1776 1777 1778
			*tail = copy_ref(r);
			tail = &((*tail)->next);
			if (!all)
				break;
		}
	}
J
Jay Soffian 已提交
1779

1780
	return list;
J
Jay Soffian 已提交
1781
}
1782 1783 1784 1785

struct stale_heads_info {
	struct string_list *ref_names;
	struct ref **stale_refs_tail;
1786 1787
	struct refspec *refs;
	int ref_count;
1788 1789 1790 1791 1792 1793
};

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;
1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809
	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);
1810
	}
1811 1812

	free(query.src);
1813 1814 1815
	return 0;
}

1816
struct ref *get_stale_heads(struct refspec *refs, int ref_count, struct ref *fetch_map)
1817 1818
{
	struct ref *ref, *stale_refs = NULL;
1819
	struct string_list ref_names = STRING_LIST_INIT_NODUP;
1820 1821 1822
	struct stale_heads_info info;
	info.ref_names = &ref_names;
	info.stale_refs_tail = &stale_refs;
1823 1824
	info.refs = refs;
	info.ref_count = ref_count;
1825
	for (ref = fetch_map; ref; ref = ref->next)
1826
		string_list_append(&ref_names, ref->name);
1827 1828 1829 1830 1831
	sort_string_list(&ref_names);
	for_each_ref(get_stale_heads_cb, &info);
	string_list_clear(&ref_names, 0);
	return stale_refs;
}