remote.c 47.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,
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 const char *pushremote_name;
53
static int explicit_default_remote_name;
54

55
static struct rewrites rewrites;
56
static struct rewrites rewrites_push;
57

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

348
static int handle_config(const char *key, const char *value, void *cb)
349 350 351 352
{
	const char *name;
	const char *subkey;
	struct remote *remote;
353 354 355 356 357 358
	struct branch *branch;
	if (!prefixcmp(key, "branch.")) {
		name = key + 7;
		subkey = strrchr(name, '.');
		if (!subkey)
			return 0;
359
		branch = make_branch(name, subkey - name);
360
		if (!strcmp(subkey, ".remote")) {
361 362
			if (git_config_string(&branch->remote_name, key, value))
				return -1;
363
			if (branch == current_branch) {
364
				default_remote_name = branch->remote_name;
365 366
				explicit_default_remote_name = 1;
			}
367 368 369 370
		} else if (!strcmp(subkey, ".pushremote")) {
			if (branch == current_branch)
				if (git_config_string(&pushremote_name, key, value))
					return -1;
371 372 373
		} else if (!strcmp(subkey, ".merge")) {
			if (!value)
				return config_error_nonbool(key);
374
			add_merge(branch, xstrdup(value));
375
		}
376
		return 0;
377
	}
378 379
	if (!prefixcmp(key, "url.")) {
		struct rewrite *rewrite;
380
		name = key + 4;
381 382 383 384
		subkey = strrchr(name, '.');
		if (!subkey)
			return 0;
		if (!strcmp(subkey, ".insteadof")) {
385 386 387 388 389 390
			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);
391 392 393 394 395
			if (!value)
				return config_error_nonbool(key);
			add_instead_of(rewrite, xstrdup(value));
		}
	}
396

397 398 399
	if (prefixcmp(key,  "remote."))
		return 0;
	name = key + 7;
400 401 402 403 404 405

	/* Handle remote.* variables */
	if (!strcmp(name, "pushdefault"))
		return git_config_string(&pushremote_name, key, value);

	/* Handle remote.<name>.* variables */
406 407 408 409 410
	if (*name == '/') {
		warning("Config remote shorthand cannot begin with '/': %s",
			name);
		return 0;
	}
411 412
	subkey = strrchr(name, '.');
	if (!subkey)
413
		return 0;
414
	remote = make_remote(name, subkey - name);
415
	remote->origin = REMOTE_CONFIG;
416 417 418 419
	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);
420 421
	else if (!strcmp(subkey, ".skipfetchall"))
		remote->skip_default_update = git_config_bool(key, value);
422 423 424 425 426
	else if (!strcmp(subkey, ".url")) {
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
		add_url(remote, v);
427 428 429 430 431
	} else if (!strcmp(subkey, ".pushurl")) {
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
		add_pushurl(remote, v);
432
	} else if (!strcmp(subkey, ".push")) {
433 434 435 436
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
		add_push_refspec(remote, v);
437
	} else if (!strcmp(subkey, ".fetch")) {
438 439 440 441
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
		add_fetch_refspec(remote, v);
442
	} else if (!strcmp(subkey, ".receivepack")) {
443 444 445
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
446
		if (!remote->receivepack)
447
			remote->receivepack = v;
448 449
		else
			error("more than one receivepack given, using the first");
450
	} else if (!strcmp(subkey, ".uploadpack")) {
451 452 453
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
454
		if (!remote->uploadpack)
455
			remote->uploadpack = v;
456 457
		else
			error("more than one uploadpack given, using the first");
458 459 460
	} else if (!strcmp(subkey, ".tagopt")) {
		if (!strcmp(value, "--no-tags"))
			remote->fetch_tags = -1;
461 462
		else if (!strcmp(value, "--tags"))
			remote->fetch_tags = 2;
S
Sam Vilain 已提交
463
	} else if (!strcmp(subkey, ".proxy")) {
464 465
		return git_config_string((const char **)&remote->http_proxy,
					 key, value);
466 467
	} else if (!strcmp(subkey, ".vcs")) {
		return git_config_string(&remote->foreign_vcs, key, value);
468
	}
469 470 471
	return 0;
}

472 473 474 475
static void alias_all_urls(void)
{
	int i, j;
	for (i = 0; i < remotes_nr; i++) {
476
		int add_pushurl_aliases;
477 478
		if (!remotes[i])
			continue;
479
		for (j = 0; j < remotes[i]->pushurl_nr; j++) {
480
			remotes[i]->pushurl[j] = alias_url(remotes[i]->pushurl[j], &rewrites);
481
		}
482 483 484 485 486 487
		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);
		}
488 489 490
	}
}

491 492 493 494 495
static void read_config(void)
{
	unsigned char sha1[20];
	const char *head_ref;
	int flag;
496
	if (default_remote_name) /* did this already */
497 498 499
		return;
	default_remote_name = xstrdup("origin");
	current_branch = NULL;
500
	head_ref = resolve_ref_unsafe("HEAD", sha1, 0, &flag);
501 502
	if (head_ref && (flag & REF_ISSYMREF) &&
	    !prefixcmp(head_ref, "refs/heads/")) {
503 504
		current_branch =
			make_branch(head_ref + strlen("refs/heads/"), 0);
505
	}
506
	git_config(handle_config, NULL);
507
	alias_all_urls();
508 509
}

510 511 512 513 514 515
/*
 * 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.
 */
516
static void free_refspecs(struct refspec *refspec, int nr_refspec)
517 518 519 520 521 522 523 524 525 526 527 528 529
{
	int i;

	if (!refspec)
		return;

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

530
static struct refspec *parse_refspec_internal(int nr_refspec, const char **refspec, int fetch, int verify)
531 532 533
{
	int i;
	struct refspec *rs = xcalloc(sizeof(*rs), nr_refspec);
534

535
	for (i = 0; i < nr_refspec; i++) {
536
		size_t llen;
537 538
		int is_glob;
		const char *lhs, *rhs;
539
		int flags;
540

B
Benjamin Kramer 已提交
541
		is_glob = 0;
542 543 544

		lhs = refspec[i];
		if (*lhs == '+') {
545
			rs[i].force = 1;
546
			lhs++;
547
		}
548 549

		rhs = strrchr(lhs, ':');
550 551 552

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

560
		if (rhs) {
561
			size_t rlen = strlen(++rhs);
562
			is_glob = (1 <= rlen && strchr(rhs, '*'));
D
Daniel Barkalow 已提交
563
			rs[i].dst = xstrndup(rhs, rlen);
564
		}
D
Daniel Barkalow 已提交
565

566
		llen = (rhs ? (rhs - lhs - 1) : strlen(lhs));
567
		if (1 <= llen && memchr(lhs, '*', llen)) {
568 569 570 571 572
			if ((rhs && !is_glob) || (!rhs && fetch))
				goto invalid;
			is_glob = 1;
		} else if (rhs && is_glob) {
			goto invalid;
D
Daniel Barkalow 已提交
573
		}
574

575 576
		rs[i].pattern = is_glob;
		rs[i].src = xstrndup(lhs, llen);
577
		flags = REFNAME_ALLOW_ONELEVEL | (is_glob ? REFNAME_REFSPEC_PATTERN : 0);
578 579

		if (fetch) {
580 581
			unsigned char unused[40];

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

 invalid:
637
	if (verify) {
638 639 640 641 642 643
		/*
		 * 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);
644 645
		return NULL;
	}
646 647 648
	die("Invalid refspec '%s'", refspec[i]);
}

649 650 651 652
int valid_fetch_refspec(const char *fetch_refspec_str)
{
	struct refspec *refspec;

653
	refspec = parse_refspec_internal(1, &fetch_refspec_str, 1, 1);
654
	free_refspecs(refspec, 1);
655 656 657
	return !!refspec;
}

658 659
struct refspec *parse_fetch_refspec(int nr_refspec, const char **refspec)
{
660
	return parse_refspec_internal(nr_refspec, refspec, 1, 0);
661 662
}

663
static struct refspec *parse_push_refspec(int nr_refspec, const char **refspec)
664
{
665
	return parse_refspec_internal(nr_refspec, refspec, 0, 0);
666 667
}

668 669 670 671 672 673 674 675 676 677
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);
}

678 679
static int valid_remote_nick(const char *name)
{
680
	if (!name[0] || is_dot_or_dotdot(name))
681 682 683 684
		return 0;
	return !strchr(name, '/'); /* no slash */
}

685
static struct remote *remote_get_1(const char *name, const char *pushremote_name)
686 687
{
	struct remote *ret;
688
	int name_given = 0;
689

690 691 692
	if (name)
		name_given = 1;
	else {
693 694 695 696 697 698 699
		if (pushremote_name) {
			name = pushremote_name;
			name_given = 1;
		} else {
			name = default_remote_name;
			name_given = explicit_default_remote_name;
		}
700
	}
701

702
	ret = make_remote(name, 0);
703
	if (valid_remote_nick(name)) {
704
		if (!valid_remote(ret))
705
			read_remotes_file(ret);
706
		if (!valid_remote(ret))
707 708
			read_branches_file(ret);
	}
709
	if (name_given && !valid_remote(ret))
710
		add_url_alias(ret, name);
711
	if (!valid_remote(ret))
712
		return NULL;
713 714
	ret->fetch = parse_fetch_refspec(ret->fetch_refspec_nr, ret->fetch_refspec);
	ret->push = parse_push_refspec(ret->push_refspec_nr, ret->push_refspec);
715 716
	return ret;
}
717

718 719 720 721 722 723 724 725 726 727 728 729
struct remote *remote_get(const char *name)
{
	read_config();
	return remote_get_1(name, NULL);
}

struct remote *pushremote_get(const char *name)
{
	read_config();
	return remote_get_1(name, pushremote_name);
}

730 731 732 733 734 735 736 737 738 739 740
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;
}

741 742 743 744
int for_each_remote(each_remote_fn fn, void *priv)
{
	int i, result = 0;
	read_config();
D
Daniel Barkalow 已提交
745
	for (i = 0; i < remotes_nr && !result; i++) {
746 747 748 749
		struct remote *r = remotes[i];
		if (!r)
			continue;
		if (!r->fetch)
750 751
			r->fetch = parse_fetch_refspec(r->fetch_refspec_nr,
						       r->fetch_refspec);
752
		if (!r->push)
753 754
			r->push = parse_push_refspec(r->push_refspec_nr,
						     r->push_refspec);
755 756 757 758 759
		result = fn(r, priv);
	}
	return result;
}

760 761
void ref_remove_duplicates(struct ref *ref_map)
{
762
	struct string_list refs = STRING_LIST_INIT_NODUP;
763 764 765 766
	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;
767 768
		if (!ref_map->peer_ref)
			continue;
769

770
		item = string_list_lookup(&refs, ref_map->peer_ref->name);
771 772 773 774 775 776 777 778 779 780
		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);
781 782
			ref_map = prev; /* skip this; we freed it */
			continue;
783
		}
784

785
		item = string_list_insert(&refs, ref_map->peer_ref->name);
786
		item->util = ref_map;
787
	}
788
	string_list_clear(&refs, 0);
789 790
}

791
int remote_has_url(struct remote *remote, const char *url)
792 793
{
	int i;
794 795
	for (i = 0; i < remote->url_nr; i++) {
		if (!strcmp(remote->url[i], url))
796 797 798 799 800
			return 1;
	}
	return 0;
}

801 802
static int match_name_with_pattern(const char *key, const char *name,
				   const char *value, char **result)
803
{
D
Daniel Barkalow 已提交
804 805
	const char *kstar = strchr(key, '*');
	size_t klen;
806 807
	size_t ksuffixlen;
	size_t namelen;
D
Daniel Barkalow 已提交
808 809 810 811
	int ret;
	if (!kstar)
		die("Key '%s' of pattern had no '*'", key);
	klen = kstar - key;
812 813 814 815
	ksuffixlen = strlen(kstar + 1);
	namelen = strlen(name);
	ret = !strncmp(name, key, klen) && namelen >= klen + ksuffixlen &&
		!memcmp(name + namelen - ksuffixlen, kstar + 1, ksuffixlen);
816
	if (ret && value) {
D
Daniel Barkalow 已提交
817 818
		const char *vstar = strchr(value, '*');
		size_t vlen;
819
		size_t vsuffixlen;
D
Daniel Barkalow 已提交
820 821 822
		if (!vstar)
			die("Value '%s' of pattern has no '*'", value);
		vlen = vstar - value;
823 824
		vsuffixlen = strlen(vstar + 1);
		*result = xmalloc(vlen + vsuffixlen +
825
				  strlen(name) -
826 827 828 829 830 831
				  klen - ksuffixlen + 1);
		strncpy(*result, value, vlen);
		strncpy(*result + vlen,
			name + klen, namelen - klen - ksuffixlen);
		strcpy(*result + vlen + namelen - klen - ksuffixlen,
		       vstar + 1);
832
	}
833 834 835
	return ret;
}

836
static int query_refspecs(struct refspec *refs, int ref_count, struct refspec *query)
837 838
{
	int i;
839
	int find_src = !query->src;
840

841 842
	if (find_src && !query->dst)
		return error("query_refspecs: need either src or dst");
843

844 845 846 847 848 849
	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;
850

851
		if (!refspec->dst)
852
			continue;
853
		if (refspec->pattern) {
854
			if (match_name_with_pattern(key, needle, value, result)) {
855
				query->force = refspec->force;
856 857
				return 0;
			}
858 859
		} else if (!strcmp(needle, key)) {
			*result = xstrdup(value);
860
			query->force = refspec->force;
861
			return 0;
862 863 864 865 866
		}
	}
	return -1;
}

867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885
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 已提交
886 887 888 889 890 891 892 893 894 895
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;
}

896
struct ref *alloc_ref(const char *name)
897
{
898
	return alloc_ref_with_prefix("", 0, name);
899 900
}

J
Jeff King 已提交
901
struct ref *copy_ref(const struct ref *ref)
902
{
903 904 905 906 907 908 909 910 911 912 913 914
	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;
915 916
}

917 918 919 920 921 922 923 924 925 926 927 928
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;
}

929
static void free_ref(struct ref *ref)
930 931 932
{
	if (!ref)
		return;
933
	free_ref(ref->peer_ref);
934 935 936 937 938
	free(ref->remote_status);
	free(ref->symref);
	free(ref);
}

939 940 941 942 943
void free_refs(struct ref *ref)
{
	struct ref *next;
	while (ref) {
		next = ref->next;
944
		free_ref(ref);
945 946 947 948
		ref = next;
	}
}

949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969
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);
}

970 971 972 973 974 975 976 977 978 979 980 981 982 983
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);

984
		if (!refname_match(pattern, name, ref_rev_parse_rules))
985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023
			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;
	}
}

1024
static void tail_link_ref(struct ref *ref, struct ref ***tail)
1025 1026
{
	**tail = ref;
1027 1028
	while (ref->next)
		ref = ref->next;
1029 1030 1031
	*tail = &ref->next;
}

1032 1033 1034 1035 1036 1037 1038
static struct ref *alloc_delete_ref(void)
{
	struct ref *ref = alloc_ref("(delete)");
	hashclr(ref->new_sha1);
	return ref;
}

1039 1040 1041 1042 1043
static struct ref *try_explicit_object_name(const char *name)
{
	unsigned char sha1[20];
	struct ref *ref;

1044 1045
	if (!*name)
		return alloc_delete_ref();
1046 1047
	if (get_sha1(name, sha1))
		return NULL;
1048
	ref = alloc_ref(name);
1049 1050 1051 1052
	hashcpy(ref->new_sha1, sha1);
	return ref;
}

1053
static struct ref *make_linked_ref(const char *name, struct ref ***tail)
1054
{
1055
	struct ref *ret = alloc_ref(name);
1056 1057
	tail_link_ref(ret, tail);
	return ret;
1058
}
1059

1060 1061 1062 1063 1064
static char *guess_ref(const char *name, struct ref *peer)
{
	struct strbuf buf = STRBUF_INIT;
	unsigned char sha1[20];

1065
	const char *r = resolve_ref_unsafe(peer->name, sha1, 1, NULL);
1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079
	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);
}

1080 1081
static int match_explicit(struct ref *src, struct ref *dst,
			  struct ref ***dst_tail,
1082
			  struct refspec *rs)
1083
{
1084
	struct ref *matched_src, *matched_dst;
1085
	int copy_src;
1086

1087
	const char *dst_value = rs->dst;
1088
	char *dst_guess;
1089

1090
	if (rs->pattern || rs->matching)
1091
		return 0;
1092

1093 1094 1095
	matched_src = matched_dst = NULL;
	switch (count_refspec_match(rs->src, src, &matched_src)) {
	case 1:
1096
		copy_src = 1;
1097 1098 1099 1100 1101 1102 1103
		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);
1104
		if (!matched_src)
1105
			return error("src refspec %s does not match any.", rs->src);
1106
		copy_src = 0;
1107 1108
		break;
	default:
1109
		return error("src refspec %s matches more than one.", rs->src);
1110
	}
1111

1112
	if (!dst_value) {
1113 1114 1115
		unsigned char sha1[20];
		int flag;

1116
		dst_value = resolve_ref_unsafe(matched_src->name, sha1, 1, &flag);
1117 1118 1119 1120 1121
		if (!dst_value ||
		    ((flag & REF_ISSYMREF) &&
		     prefixcmp(dst_value, "refs/heads/")))
			die("%s cannot be resolved to branch.",
			    matched_src->name);
1122
	}
1123

1124 1125 1126 1127
	switch (count_refspec_match(dst_value, dst, &matched_dst)) {
	case 1:
		break;
	case 0:
1128
		if (!memcmp(dst_value, "refs/", 5))
1129
			matched_dst = make_linked_ref(dst_value, dst_tail);
1130 1131 1132
		else if (is_null_sha1(matched_src->new_sha1))
			error("unable to delete '%s': remote ref does not exist",
			      dst_value);
1133
		else if ((dst_guess = guess_ref(dst_value, matched_src)))
1134
			matched_dst = make_linked_ref(dst_guess, dst_tail);
1135
		else
1136 1137 1138 1139 1140 1141
			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);
1142 1143
		break;
	default:
1144
		matched_dst = NULL;
1145 1146 1147 1148
		error("dst refspec %s matches more than one.",
		      dst_value);
		break;
	}
1149 1150 1151 1152
	if (!matched_dst)
		return -1;
	if (matched_dst->peer_ref)
		return error("dst ref %s receives from more than one src.",
1153 1154
		      matched_dst->name);
	else {
1155
		matched_dst->peer_ref = copy_src ? copy_ref(matched_src) : matched_src;
1156
		matched_dst->force = rs->force;
1157
	}
1158
	return 0;
1159 1160 1161 1162 1163 1164 1165 1166
}

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++)
1167 1168
		errs += match_explicit(src, dst, dst_tail, &rs[i]);
	return errs;
1169 1170
}

1171
static char *get_ref_match(const struct refspec *rs, int rs_nr, const struct ref *ref,
F
Felipe Contreras 已提交
1172
		int send_mirror, int direction, const struct refspec **ret_pat)
1173
{
1174 1175
	const struct refspec *pat;
	char *name;
1176
	int i;
1177
	int matching_refs = -1;
1178
	for (i = 0; i < rs_nr; i++) {
1179 1180 1181 1182 1183 1184
		if (rs[i].matching &&
		    (matching_refs == -1 || rs[i].force)) {
			matching_refs = i;
			continue;
		}

1185 1186
		if (rs[i].pattern) {
			const char *dst_side = rs[i].dst ? rs[i].dst : rs[i].src;
F
Felipe Contreras 已提交
1187 1188 1189 1190 1191 1192
			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) {
1193 1194 1195 1196
				matching_refs = i;
				break;
			}
		}
1197
	}
1198
	if (matching_refs == -1)
1199
		return NULL;
1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214

	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;
1215 1216
}

1217 1218 1219 1220 1221 1222 1223 1224
static struct ref **tail_ref(struct ref **head)
{
	struct ref **tail = head;
	while (*tail)
		tail = &((*tail)->next);
	return tail;
}

J
Junio C Hamano 已提交
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 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319
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);
}

1320
/*
1321 1322 1323 1324 1325 1326
 * 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).
1327
 */
1328 1329
int match_push_refs(struct ref *src, struct ref **dst,
		    int nr_refspec, const char **refspec, int flags)
1330
{
1331
	struct refspec *rs;
A
Andy Whitcroft 已提交
1332 1333
	int send_all = flags & MATCH_REFS_ALL;
	int send_mirror = flags & MATCH_REFS_MIRROR;
F
Felipe Contreras 已提交
1334
	int send_prune = flags & MATCH_REFS_PRUNE;
1335
	int errs;
1336
	static const char *default_refspec[] = { ":", NULL };
1337
	struct ref *ref, **dst_tail = tail_ref(dst);
1338

1339 1340 1341 1342 1343
	if (!nr_refspec) {
		nr_refspec = 1;
		refspec = default_refspec;
	}
	rs = parse_push_refspec(nr_refspec, (const char **) refspec);
1344
	errs = match_explicit_refs(src, *dst, &dst_tail, rs, nr_refspec);
1345 1346

	/* pick the remainder */
1347
	for (ref = src; ref; ref = ref->next) {
1348
		struct ref *dst_peer;
1349 1350
		const struct refspec *pat = NULL;
		char *dst_name;
1351

F
Felipe Contreras 已提交
1352
		dst_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_SRC, &pat);
1353
		if (!dst_name)
1354 1355
			continue;

1356
		dst_peer = find_ref_by_name(*dst, dst_name);
1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368
		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 已提交
1369

1370
			/* Create a new one and link it */
1371
			dst_peer = make_linked_ref(dst_name, &dst_tail);
1372
			hashcpy(dst_peer->new_sha1, ref->new_sha1);
1373
		}
1374
		dst_peer->peer_ref = copy_ref(ref);
1375
		dst_peer->force = pat->force;
1376 1377
	free_name:
		free(dst_name);
1378
	}
J
Junio C Hamano 已提交
1379 1380 1381 1382

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

F
Felipe Contreras 已提交
1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399
	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);
			}
		}
	}
1400 1401
	if (errs)
		return -1;
1402 1403
	return 0;
}
1404

1405 1406 1407 1408 1409 1410
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) {
1411 1412
		int force_ref_update = ref->force || force_update;

1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424
		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 已提交
1425
		/*
1426 1427 1428
		 * Decide whether an individual refspec A:B can be
		 * pushed.  The push will succeed if any of the
		 * following are true:
1429
		 *
C
Chris Rorvick 已提交
1430
		 * (1) the remote reference B does not exist
1431
		 *
C
Chris Rorvick 已提交
1432 1433
		 * (2) the remote reference B is being removed (i.e.,
		 *     pushing :B where no source is specified)
1434
		 *
1435 1436 1437
		 * (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.
1438
		 *
C
Chris Rorvick 已提交
1439 1440
		 * (4) it is forced using the +A:B notation, or by
		 *     passing the --force argument
1441 1442
		 */

1443
		if (!ref->deletion && !is_null_sha1(ref->old_sha1)) {
1444 1445 1446 1447
			int why = 0; /* why would this push require --force? */

			if (!prefixcmp(ref->name, "refs/tags/"))
				why = REF_STATUS_REJECT_ALREADY_EXISTS;
1448 1449 1450 1451 1452 1453
			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))
1454 1455 1456 1457 1458
				why = REF_STATUS_REJECT_NONFASTFORWARD;

			if (!force_ref_update)
				ref->status = why;
			else if (why)
1459
				ref->forced_update = 1;
1460 1461 1462 1463
		}
	}
}

1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481
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]);
1482 1483 1484
				if (remote_find_tracking(ret->remote, ret->merge[i])
				    && !strcmp(ret->remote_name, "."))
					ret->merge[i]->dst = xstrdup(ret->merge_name[i]);
1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495
			}
		}
	}
	return ret;
}

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

1496 1497 1498
int branch_merge_matches(struct branch *branch,
		                 int i,
		                 const char *refname)
1499
{
1500
	if (!branch || i < 0 || i >= branch->merge_nr)
1501
		return 0;
1502
	return refname_match(branch->merge[i]->src, refname, ref_fetch_rules);
1503
}
1504

1505 1506 1507 1508 1509 1510 1511 1512 1513 1514
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);
}

1515
static struct ref *get_expanded_map(const struct ref *remote_refs,
1516 1517
				    const struct refspec *refspec)
{
1518
	const struct ref *ref;
1519 1520 1521
	struct ref *ret = NULL;
	struct ref **tail = &ret;

1522
	char *expn_name;
1523 1524 1525 1526

	for (ref = remote_refs; ref; ref = ref->next) {
		if (strchr(ref->name, '^'))
			continue; /* a dereference item */
1527
		if (match_name_with_pattern(refspec->src, ref->name,
1528 1529
					    refspec->dst, &expn_name) &&
		    !ignore_symref_update(expn_name)) {
1530 1531
			struct ref *cpy = copy_ref(ref);

1532 1533
			cpy->peer_ref = alloc_ref(expn_name);
			free(expn_name);
1534 1535 1536 1537 1538 1539 1540 1541 1542 1543
			if (refspec->force)
				cpy->peer_ref->force = 1;
			*tail = cpy;
			tail = &cpy->next;
		}
	}

	return ret;
}

1544
static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
1545
{
1546
	const struct ref *ref;
1547
	for (ref = refs; ref; ref = ref->next) {
1548
		if (refname_match(name, ref->name, ref_fetch_rules))
1549 1550 1551 1552 1553
			return ref;
	}
	return NULL;
}

1554
struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
1555
{
1556
	const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
1557 1558

	if (!ref)
1559
		return NULL;
1560 1561 1562 1563 1564 1565

	return copy_ref(ref);
}

static struct ref *get_local_ref(const char *name)
{
1566
	if (!name || name[0] == '\0')
1567 1568
		return NULL;

1569 1570
	if (!prefixcmp(name, "refs/"))
		return alloc_ref(name);
1571 1572 1573

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

R
René Scharfe 已提交
1577
	return alloc_ref_with_prefix("refs/heads/", 11, name);
1578 1579
}

1580
int get_fetch_map(const struct ref *remote_refs,
1581
		  const struct refspec *refspec,
1582 1583
		  struct ref ***tail,
		  int missing_ok)
1584
{
D
Daniel Barkalow 已提交
1585
	struct ref *ref_map, **rmp;
1586 1587 1588 1589

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

1592 1593 1594 1595 1596 1597
		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);
		}
1598 1599 1600 1601 1602 1603 1604
		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;
		}
1605 1606
	}

D
Daniel Barkalow 已提交
1607 1608
	for (rmp = &ref_map; *rmp; ) {
		if ((*rmp)->peer_ref) {
1609 1610
			if (prefixcmp((*rmp)->peer_ref->name, "refs/") ||
			    check_refname_format((*rmp)->peer_ref->name, 0)) {
D
Daniel Barkalow 已提交
1611 1612 1613 1614 1615 1616 1617 1618 1619 1620
				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);
1621 1622
	}

1623 1624
	if (ref_map)
		tail_link_ref(ref_map, tail);
1625 1626 1627

	return 0;
}
1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639

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

1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657
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;

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

1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714
/*
 * 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;
1715
	if (read_ref(base, sha1))
1716
		return 0;
1717
	theirs = lookup_commit_reference(sha1);
1718 1719 1720
	if (!theirs)
		return 0;

1721
	if (read_ref(branch->refname, sha1))
1722
		return 0;
1723
	ours = lookup_commit_reference(sha1);
1724 1725 1726 1727 1728 1729 1730
	if (!ours)
		return 0;

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

1731
	/* Run "rev-list --left-right ours...theirs" internally... */
1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758
	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)++;
	}
1759 1760 1761 1762

	/* clear object flags smudged by the above traversal */
	clear_commit_marks(ours, ALL_REV_FLAGS);
	clear_commit_marks(theirs, ALL_REV_FLAGS);
1763 1764 1765 1766 1767 1768 1769 1770 1771
	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;
1772
	const char *base;
1773 1774 1775 1776 1777

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

	base = branch->merge[0]->dst;
1778
	base = shorten_unambiguous_ref(base, 0);
1779
	if (!num_theirs) {
1780 1781 1782 1783 1784
		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);
1785 1786 1787
		if (advice_status_hints)
			strbuf_addf(sb,
				_("  (use \"git push\" to publish your local commits)\n"));
1788
	} else if (!num_ours) {
1789 1790 1791 1792 1793 1794 1795
		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);
1796 1797 1798
		if (advice_status_hints)
			strbuf_addf(sb,
				_("  (use \"git pull\" to update your local branch)\n"));
1799
	} else {
1800 1801 1802 1803 1804 1805 1806 1807 1808
		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);
1809 1810 1811
		if (advice_status_hints)
			strbuf_addf(sb,
				_("  (use \"git pull\" to merge the remote branch into yours)\n"));
1812
	}
1813 1814
	return 1;
}
1815 1816 1817 1818 1819 1820 1821 1822

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 */
1823
	if (check_refname_format(refname + 5, 0))
1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836
		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)
{
1837
	struct ref *local_refs = NULL, **local_tail = &local_refs;
1838 1839 1840
	for_each_ref(one_local_ref, &local_tail);
	return local_refs;
}
J
Jay Soffian 已提交
1841

1842 1843 1844
struct ref *guess_remote_head(const struct ref *head,
			      const struct ref *refs,
			      int all)
J
Jay Soffian 已提交
1845 1846
{
	const struct ref *r;
1847 1848
	struct ref *list = NULL;
	struct ref **tail = &list;
J
Jay Soffian 已提交
1849

1850
	if (!head)
J
Jay Soffian 已提交
1851 1852
		return NULL;

1853 1854 1855 1856 1857 1858 1859 1860
	/*
	 * 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 已提交
1861
	/* If refs/heads/master could be right, it is. */
1862 1863 1864 1865 1866
	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 已提交
1867 1868

	/* Look for another ref that points there */
1869
	for (r = refs; r; r = r->next) {
1870 1871 1872
		if (r != head &&
		    !prefixcmp(r->name, "refs/heads/") &&
		    !hashcmp(r->old_sha1, head->old_sha1)) {
1873 1874 1875 1876 1877 1878
			*tail = copy_ref(r);
			tail = &((*tail)->next);
			if (!all)
				break;
		}
	}
J
Jay Soffian 已提交
1879

1880
	return list;
J
Jay Soffian 已提交
1881
}
1882 1883 1884 1885

struct stale_heads_info {
	struct string_list *ref_names;
	struct ref **stale_refs_tail;
1886 1887
	struct refspec *refs;
	int ref_count;
1888 1889 1890 1891 1892 1893
};

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;
1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909
	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);
1910
	}
1911 1912

	free(query.src);
1913 1914 1915
	return 0;
}

1916
struct ref *get_stale_heads(struct refspec *refs, int ref_count, struct ref *fetch_map)
1917 1918
{
	struct ref *ref, *stale_refs = NULL;
1919
	struct string_list ref_names = STRING_LIST_INIT_NODUP;
1920 1921 1922
	struct stale_heads_info info;
	info.ref_names = &ref_names;
	info.stale_refs_tail = &stale_refs;
1923 1924
	info.refs = refs;
	info.ref_count = ref_count;
1925
	for (ref = fetch_map; ref; ref = ref->next)
1926
		string_list_append(&ref_names, ref->name);
1927 1928 1929 1930 1931
	sort_string_list(&ref_names);
	for_each_ref(get_stale_heads_cb, &info);
	string_list_clear(&ref_names, 0);
	return stale_refs;
}