remote.c 46.4 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,
18
	0,
D
Daniel Barkalow 已提交
19 20
	"refs/tags/*",
	"refs/tags/*"
21 22 23 24
};

const struct refspec *tag_refspec = &s_tag_refspec;

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

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

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

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

54
static struct rewrites rewrites;
55
static struct rewrites rewrites_push;
56

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

347
static int handle_config(const char *key, const char *value, void *cb)
348 349 350 351
{
	const char *name;
	const char *subkey;
	struct remote *remote;
352 353 354 355 356 357
	struct branch *branch;
	if (!prefixcmp(key, "branch.")) {
		name = key + 7;
		subkey = strrchr(name, '.');
		if (!subkey)
			return 0;
358
		branch = make_branch(name, subkey - name);
359
		if (!strcmp(subkey, ".remote")) {
360 361
			if (git_config_string(&branch->remote_name, key, value))
				return -1;
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 569
			unsigned char unused[40];

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

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

637 638 639 640
int valid_fetch_refspec(const char *fetch_refspec_str)
{
	struct refspec *refspec;

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

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

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

656 657 658 659 660 661 662 663 664 665
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);
}

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

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

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

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

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

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

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

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

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

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

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

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

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

816 817 818 819 820 821
	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;
822

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

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

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

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

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

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

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

921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941
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);
}

942 943 944 945 946 947 948 949 950 951 952 953 954 955
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);

956
		if (!refname_match(pattern, name, ref_rev_parse_rules))
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 992 993 994 995
			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;
	}
}

996
static void tail_link_ref(struct ref *ref, struct ref ***tail)
997 998
{
	**tail = ref;
999 1000
	while (ref->next)
		ref = ref->next;
1001 1002 1003
	*tail = &ref->next;
}

1004 1005 1006 1007 1008 1009 1010
static struct ref *alloc_delete_ref(void)
{
	struct ref *ref = alloc_ref("(delete)");
	hashclr(ref->new_sha1);
	return ref;
}

1011 1012 1013 1014 1015
static struct ref *try_explicit_object_name(const char *name)
{
	unsigned char sha1[20];
	struct ref *ref;

1016 1017
	if (!*name)
		return alloc_delete_ref();
1018 1019
	if (get_sha1(name, sha1))
		return NULL;
1020
	ref = alloc_ref(name);
1021 1022 1023 1024
	hashcpy(ref->new_sha1, sha1);
	return ref;
}

1025
static struct ref *make_linked_ref(const char *name, struct ref ***tail)
1026
{
1027
	struct ref *ret = alloc_ref(name);
1028 1029
	tail_link_ref(ret, tail);
	return ret;
1030
}
1031

1032 1033 1034 1035 1036
static char *guess_ref(const char *name, struct ref *peer)
{
	struct strbuf buf = STRBUF_INIT;
	unsigned char sha1[20];

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

1052 1053
static int match_explicit(struct ref *src, struct ref *dst,
			  struct ref ***dst_tail,
1054
			  struct refspec *rs)
1055
{
1056
	struct ref *matched_src, *matched_dst;
1057
	int copy_src;
1058

1059
	const char *dst_value = rs->dst;
1060
	char *dst_guess;
1061

1062
	if (rs->pattern || rs->matching)
1063
		return 0;
1064

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

1084
	if (!dst_value) {
1085 1086 1087
		unsigned char sha1[20];
		int flag;

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

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

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++)
1139 1140
		errs += match_explicit(src, dst, dst_tail, &rs[i]);
	return errs;
1141 1142
}

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

1157 1158
		if (rs[i].pattern) {
			const char *dst_side = rs[i].dst ? rs[i].dst : rs[i].src;
F
Felipe Contreras 已提交
1159 1160 1161 1162 1163 1164
			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) {
1165 1166 1167 1168
				matching_refs = i;
				break;
			}
		}
1169
	}
1170
	if (matching_refs == -1)
1171
		return NULL;
1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186

	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;
1187 1188
}

1189 1190 1191 1192 1193 1194 1195 1196
static struct ref **tail_ref(struct ref **head)
{
	struct ref **tail = head;
	while (*tail)
		tail = &((*tail)->next);
	return tail;
}

J
Junio C Hamano 已提交
1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 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 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291
struct tips {
	struct commit **tip;
	int nr, alloc;
};

static void add_to_tips(struct tips *tips, const unsigned char *sha1)
{
	struct commit *commit;

	if (is_null_sha1(sha1))
		return;
	commit = lookup_commit_reference_gently(sha1, 1);
	if (!commit || (commit->object.flags & TMP_MARK))
		return;
	commit->object.flags |= TMP_MARK;
	ALLOC_GROW(tips->tip, tips->nr + 1, tips->alloc);
	tips->tip[tips->nr++] = commit;
}

static void add_missing_tags(struct ref *src, struct ref **dst, struct ref ***dst_tail)
{
	struct string_list dst_tag = STRING_LIST_INIT_NODUP;
	struct string_list src_tag = STRING_LIST_INIT_NODUP;
	struct string_list_item *item;
	struct ref *ref;
	struct tips sent_tips;

	/*
	 * Collect everything we know they would have at the end of
	 * this push, and collect all tags they have.
	 */
	memset(&sent_tips, 0, sizeof(sent_tips));
	for (ref = *dst; ref; ref = ref->next) {
		if (ref->peer_ref &&
		    !is_null_sha1(ref->peer_ref->new_sha1))
			add_to_tips(&sent_tips, ref->peer_ref->new_sha1);
		else
			add_to_tips(&sent_tips, ref->old_sha1);
		if (!prefixcmp(ref->name, "refs/tags/"))
			string_list_append(&dst_tag, ref->name);
	}
	clear_commit_marks_many(sent_tips.nr, sent_tips.tip, TMP_MARK);

	sort_string_list(&dst_tag);

	/* Collect tags they do not have. */
	for (ref = src; ref; ref = ref->next) {
		if (prefixcmp(ref->name, "refs/tags/"))
			continue; /* not a tag */
		if (string_list_has_string(&dst_tag, ref->name))
			continue; /* they already have it */
		if (sha1_object_info(ref->new_sha1, NULL) != OBJ_TAG)
			continue; /* be conservative */
		item = string_list_append(&src_tag, ref->name);
		item->util = ref;
	}
	string_list_clear(&dst_tag, 0);

	/*
	 * At this point, src_tag lists tags that are missing from
	 * dst, and sent_tips lists the tips we are pushing or those
	 * that we know they already have. An element in the src_tag
	 * that is an ancestor of any of the sent_tips needs to be
	 * sent to the other side.
	 */
	if (sent_tips.nr) {
		for_each_string_list_item(item, &src_tag) {
			struct ref *ref = item->util;
			struct ref *dst_ref;
			struct commit *commit;

			if (is_null_sha1(ref->new_sha1))
				continue;
			commit = lookup_commit_reference_gently(ref->new_sha1, 1);
			if (!commit)
				/* not pushing a commit, which is not an error */
				continue;

			/*
			 * Is this tag, which they do not have, reachable from
			 * any of the commits we are sending?
			 */
			if (!in_merge_bases_many(commit, sent_tips.nr, sent_tips.tip))
				continue;

			/* Add it in */
			dst_ref = make_linked_ref(ref->name, dst_tail);
			hashcpy(dst_ref->new_sha1, ref->new_sha1);
			dst_ref->peer_ref = copy_ref(ref);
		}
	}
	string_list_clear(&src_tag, 0);
	free(sent_tips.tip);
}

1292
/*
1293 1294 1295 1296 1297 1298
 * 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).
1299
 */
1300 1301
int match_push_refs(struct ref *src, struct ref **dst,
		    int nr_refspec, const char **refspec, int flags)
1302
{
1303
	struct refspec *rs;
A
Andy Whitcroft 已提交
1304 1305
	int send_all = flags & MATCH_REFS_ALL;
	int send_mirror = flags & MATCH_REFS_MIRROR;
F
Felipe Contreras 已提交
1306
	int send_prune = flags & MATCH_REFS_PRUNE;
1307
	int errs;
1308
	static const char *default_refspec[] = { ":", NULL };
1309
	struct ref *ref, **dst_tail = tail_ref(dst);
1310

1311 1312 1313 1314 1315
	if (!nr_refspec) {
		nr_refspec = 1;
		refspec = default_refspec;
	}
	rs = parse_push_refspec(nr_refspec, (const char **) refspec);
1316
	errs = match_explicit_refs(src, *dst, &dst_tail, rs, nr_refspec);
1317 1318

	/* pick the remainder */
1319
	for (ref = src; ref; ref = ref->next) {
1320
		struct ref *dst_peer;
1321 1322
		const struct refspec *pat = NULL;
		char *dst_name;
1323

F
Felipe Contreras 已提交
1324
		dst_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_SRC, &pat);
1325
		if (!dst_name)
1326 1327
			continue;

1328
		dst_peer = find_ref_by_name(*dst, dst_name);
1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340
		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 已提交
1341

1342
			/* Create a new one and link it */
1343
			dst_peer = make_linked_ref(dst_name, &dst_tail);
1344
			hashcpy(dst_peer->new_sha1, ref->new_sha1);
1345
		}
1346
		dst_peer->peer_ref = copy_ref(ref);
1347
		dst_peer->force = pat->force;
1348 1349
	free_name:
		free(dst_name);
1350
	}
J
Junio C Hamano 已提交
1351 1352 1353 1354

	if (flags & MATCH_REFS_FOLLOW_TAGS)
		add_missing_tags(src, dst, &dst_tail);

F
Felipe Contreras 已提交
1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371
	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);
			}
		}
	}
1372 1373
	if (errs)
		return -1;
1374 1375
	return 0;
}
1376

1377 1378 1379 1380 1381 1382
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) {
1383 1384
		int force_ref_update = ref->force || force_update;

1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396
		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 已提交
1397
		/*
1398 1399 1400
		 * Decide whether an individual refspec A:B can be
		 * pushed.  The push will succeed if any of the
		 * following are true:
1401
		 *
C
Chris Rorvick 已提交
1402
		 * (1) the remote reference B does not exist
1403
		 *
C
Chris Rorvick 已提交
1404 1405
		 * (2) the remote reference B is being removed (i.e.,
		 *     pushing :B where no source is specified)
1406
		 *
1407 1408 1409
		 * (3) the destination is not under refs/tags/, and
		 *     if the old and new value is a commit, the new
		 *     is a descendant of the old.
1410
		 *
C
Chris Rorvick 已提交
1411 1412
		 * (4) it is forced using the +A:B notation, or by
		 *     passing the --force argument
1413 1414
		 */

1415
		if (!ref->deletion && !is_null_sha1(ref->old_sha1)) {
1416 1417 1418 1419
			int why = 0; /* why would this push require --force? */

			if (!prefixcmp(ref->name, "refs/tags/"))
				why = REF_STATUS_REJECT_ALREADY_EXISTS;
1420 1421 1422 1423 1424 1425
			else if (!has_sha1_file(ref->old_sha1))
				why = REF_STATUS_REJECT_FETCH_FIRST;
			else if (!lookup_commit_reference_gently(ref->old_sha1, 1) ||
				 !lookup_commit_reference_gently(ref->new_sha1, 1))
				why = REF_STATUS_REJECT_NEEDS_FORCE;
			else if (!ref_newer(ref->new_sha1, ref->old_sha1))
1426 1427 1428 1429 1430
				why = REF_STATUS_REJECT_NONFASTFORWARD;

			if (!force_ref_update)
				ref->status = why;
			else if (why)
1431
				ref->forced_update = 1;
1432 1433 1434 1435
		}
	}
}

1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453
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]);
1454 1455 1456
				if (remote_find_tracking(ret->remote, ret->merge[i])
				    && !strcmp(ret->remote_name, "."))
					ret->merge[i]->dst = xstrdup(ret->merge_name[i]);
1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467
			}
		}
	}
	return ret;
}

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

1468 1469 1470
int branch_merge_matches(struct branch *branch,
		                 int i,
		                 const char *refname)
1471
{
1472
	if (!branch || i < 0 || i >= branch->merge_nr)
1473
		return 0;
1474
	return refname_match(branch->merge[i]->src, refname, ref_fetch_rules);
1475
}
1476

1477 1478 1479 1480 1481 1482 1483 1484 1485 1486
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);
}

1487
static struct ref *get_expanded_map(const struct ref *remote_refs,
1488 1489
				    const struct refspec *refspec)
{
1490
	const struct ref *ref;
1491 1492 1493
	struct ref *ret = NULL;
	struct ref **tail = &ret;

1494
	char *expn_name;
1495 1496 1497 1498

	for (ref = remote_refs; ref; ref = ref->next) {
		if (strchr(ref->name, '^'))
			continue; /* a dereference item */
1499
		if (match_name_with_pattern(refspec->src, ref->name,
1500 1501
					    refspec->dst, &expn_name) &&
		    !ignore_symref_update(expn_name)) {
1502 1503
			struct ref *cpy = copy_ref(ref);

1504 1505
			cpy->peer_ref = alloc_ref(expn_name);
			free(expn_name);
1506 1507 1508 1509 1510 1511 1512 1513 1514 1515
			if (refspec->force)
				cpy->peer_ref->force = 1;
			*tail = cpy;
			tail = &cpy->next;
		}
	}

	return ret;
}

1516
static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
1517
{
1518
	const struct ref *ref;
1519
	for (ref = refs; ref; ref = ref->next) {
1520
		if (refname_match(name, ref->name, ref_fetch_rules))
1521 1522 1523 1524 1525
			return ref;
	}
	return NULL;
}

1526
struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
1527
{
1528
	const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
1529 1530

	if (!ref)
1531
		return NULL;
1532 1533 1534 1535 1536 1537

	return copy_ref(ref);
}

static struct ref *get_local_ref(const char *name)
{
1538
	if (!name || name[0] == '\0')
1539 1540
		return NULL;

1541 1542
	if (!prefixcmp(name, "refs/"))
		return alloc_ref(name);
1543 1544 1545

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

R
René Scharfe 已提交
1549
	return alloc_ref_with_prefix("refs/heads/", 11, name);
1550 1551
}

1552
int get_fetch_map(const struct ref *remote_refs,
1553
		  const struct refspec *refspec,
1554 1555
		  struct ref ***tail,
		  int missing_ok)
1556
{
D
Daniel Barkalow 已提交
1557
	struct ref *ref_map, **rmp;
1558 1559 1560 1561

	if (refspec->pattern) {
		ref_map = get_expanded_map(remote_refs, refspec);
	} else {
1562 1563
		const char *name = refspec->src[0] ? refspec->src : "HEAD";

1564 1565 1566 1567 1568 1569
		if (refspec->exact_sha1) {
			ref_map = alloc_ref(name);
			get_sha1_hex(name, ref_map->old_sha1);
		} else {
			ref_map = get_remote_ref(remote_refs, name);
		}
1570 1571 1572 1573 1574 1575 1576
		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;
		}
1577 1578
	}

D
Daniel Barkalow 已提交
1579 1580
	for (rmp = &ref_map; *rmp; ) {
		if ((*rmp)->peer_ref) {
1581 1582
			if (prefixcmp((*rmp)->peer_ref->name, "refs/") ||
			    check_refname_format((*rmp)->peer_ref->name, 0)) {
D
Daniel Barkalow 已提交
1583 1584 1585 1586 1587 1588 1589 1590 1591 1592
				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);
1593 1594
	}

1595 1596
	if (ref_map)
		tail_link_ref(ref_map, tail);
1597 1598 1599

	return 0;
}
1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611

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

1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629
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;

1630 1631
	/*
	 * Both new and old must be commit-ish and new is descendant of
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 1659 1660 1661
	 * 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;
}

1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686
/*
 * 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;
1687
	if (read_ref(base, sha1))
1688
		return 0;
1689
	theirs = lookup_commit_reference(sha1);
1690 1691 1692
	if (!theirs)
		return 0;

1693
	if (read_ref(branch->refname, sha1))
1694
		return 0;
1695
	ours = lookup_commit_reference(sha1);
1696 1697 1698 1699 1700 1701 1702
	if (!ours)
		return 0;

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

1703
	/* Run "rev-list --left-right ours...theirs" internally... */
1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730
	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)++;
	}
1731 1732 1733 1734

	/* clear object flags smudged by the above traversal */
	clear_commit_marks(ours, ALL_REV_FLAGS);
	clear_commit_marks(theirs, ALL_REV_FLAGS);
1735 1736 1737 1738 1739 1740 1741 1742 1743
	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;
1744
	const char *base;
1745 1746 1747 1748 1749

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

	base = branch->merge[0]->dst;
1750
	base = shorten_unambiguous_ref(base, 0);
1751
	if (!num_theirs) {
1752 1753 1754 1755 1756
		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);
1757 1758 1759
		if (advice_status_hints)
			strbuf_addf(sb,
				_("  (use \"git push\" to publish your local commits)\n"));
1760
	} else if (!num_ours) {
1761 1762 1763 1764 1765 1766 1767
		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);
1768 1769 1770
		if (advice_status_hints)
			strbuf_addf(sb,
				_("  (use \"git pull\" to update your local branch)\n"));
1771
	} else {
1772 1773 1774 1775 1776 1777 1778 1779 1780
		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);
1781 1782 1783
		if (advice_status_hints)
			strbuf_addf(sb,
				_("  (use \"git pull\" to merge the remote branch into yours)\n"));
1784
	}
1785 1786
	return 1;
}
1787 1788 1789 1790 1791 1792 1793 1794

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 */
1795
	if (check_refname_format(refname + 5, 0))
1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808
		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)
{
1809
	struct ref *local_refs = NULL, **local_tail = &local_refs;
1810 1811 1812
	for_each_ref(one_local_ref, &local_tail);
	return local_refs;
}
J
Jay Soffian 已提交
1813

1814 1815 1816
struct ref *guess_remote_head(const struct ref *head,
			      const struct ref *refs,
			      int all)
J
Jay Soffian 已提交
1817 1818
{
	const struct ref *r;
1819 1820
	struct ref *list = NULL;
	struct ref **tail = &list;
J
Jay Soffian 已提交
1821

1822
	if (!head)
J
Jay Soffian 已提交
1823 1824
		return NULL;

1825 1826 1827 1828 1829 1830 1831 1832
	/*
	 * 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 已提交
1833
	/* If refs/heads/master could be right, it is. */
1834 1835 1836 1837 1838
	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 已提交
1839 1840

	/* Look for another ref that points there */
1841
	for (r = refs; r; r = r->next) {
1842 1843 1844
		if (r != head &&
		    !prefixcmp(r->name, "refs/heads/") &&
		    !hashcmp(r->old_sha1, head->old_sha1)) {
1845 1846 1847 1848 1849 1850
			*tail = copy_ref(r);
			tail = &((*tail)->next);
			if (!all)
				break;
		}
	}
J
Jay Soffian 已提交
1851

1852
	return list;
J
Jay Soffian 已提交
1853
}
1854 1855 1856 1857

struct stale_heads_info {
	struct string_list *ref_names;
	struct ref **stale_refs_tail;
1858 1859
	struct refspec *refs;
	int ref_count;
1860 1861 1862 1863 1864 1865
};

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;
1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881
	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);
1882
	}
1883 1884

	free(query.src);
1885 1886 1887
	return 0;
}

1888
struct ref *get_stale_heads(struct refspec *refs, int ref_count, struct ref *fetch_map)
1889 1890
{
	struct ref *ref, *stale_refs = NULL;
1891
	struct string_list ref_names = STRING_LIST_INIT_NODUP;
1892 1893 1894
	struct stale_heads_info info;
	info.ref_names = &ref_names;
	info.stale_refs_tail = &stale_refs;
1895 1896
	info.refs = refs;
	info.ref_count = ref_count;
1897
	for (ref = fetch_map; ref; ref = ref->next)
1898
		string_list_append(&ref_names, ref->name);
1899 1900 1901 1902 1903
	sort_string_list(&ref_names);
	for_each_ref(get_stale_heads_cb, &info);
	string_list_clear(&ref_names, 0);
	return stale_refs;
}