remote.c 55.0 KB
Newer Older
1 2 3
#include "cache.h"
#include "remote.h"
#include "refs.h"
4 5 6
#include "commit.h"
#include "diff.h"
#include "revision.h"
7
#include "dir.h"
8
#include "tag.h"
9
#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 *branch_pushremote_name;
53
static const char *pushremote_name;
54
static int explicit_default_remote_name;
55

56
static struct rewrites rewrites;
57
static struct rewrites rewrites_push;
58

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

static void read_branches_file(struct remote *remote)
{
277
	char *frag;
278
	struct strbuf branch = STRBUF_INIT;
279
	int n = 1000;
280 281 282 283 284 285 286 287 288 289 290 291 292 293
	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;
294
	remote->origin = REMOTE_BRANCHES;
295 296 297 298 299 300
	p = s + strlen(s);
	while (isspace(p[-1]))
		*--p = 0;
	len = p - s;
	p = xmalloc(len + 1);
	strcpy(p, s);
301 302

	/*
303
	 * The branches file would have URL and optionally
304 305 306
	 * #branch specified.  The "master" (or specified) branch is
	 * fetched and stored in the local branch of the same name.
	 */
307 308 309
	frag = strchr(p, '#');
	if (frag) {
		*(frag++) = '\0';
310 311 312
		strbuf_addf(&branch, "refs/heads/%s", frag);
	} else
		strbuf_addstr(&branch, "refs/heads/master");
313 314

	strbuf_addf(&branch, ":refs/heads/%s", remote->name);
315
	add_url_alias(remote, p);
316
	add_fetch_refspec(remote, strbuf_detach(&branch, NULL));
317 318 319 320 321 322 323 324 325 326
	/*
	 * 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");
327
	add_push_refspec(remote, strbuf_detach(&branch, NULL));
328
	remote->fetch_tags = 1; /* always auto-follow */
329 330
}

331
static int handle_config(const char *key, const char *value, void *cb)
332 333 334 335
{
	const char *name;
	const char *subkey;
	struct remote *remote;
336
	struct branch *branch;
337
	if (starts_with(key, "branch.")) {
338 339 340 341
		name = key + 7;
		subkey = strrchr(name, '.');
		if (!subkey)
			return 0;
342
		branch = make_branch(name, subkey - name);
343
		if (!strcmp(subkey, ".remote")) {
344 345
			if (git_config_string(&branch->remote_name, key, value))
				return -1;
346
			if (branch == current_branch) {
347
				default_remote_name = branch->remote_name;
348 349
				explicit_default_remote_name = 1;
			}
350 351
		} else if (!strcmp(subkey, ".pushremote")) {
			if (branch == current_branch)
352
				if (git_config_string(&branch_pushremote_name, key, value))
353
					return -1;
354 355 356
		} else if (!strcmp(subkey, ".merge")) {
			if (!value)
				return config_error_nonbool(key);
357
			add_merge(branch, xstrdup(value));
358
		}
359
		return 0;
360
	}
361
	if (starts_with(key, "url.")) {
362
		struct rewrite *rewrite;
363
		name = key + 4;
364 365 366 367
		subkey = strrchr(name, '.');
		if (!subkey)
			return 0;
		if (!strcmp(subkey, ".insteadof")) {
368 369 370 371 372 373
			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);
374 375 376 377 378
			if (!value)
				return config_error_nonbool(key);
			add_instead_of(rewrite, xstrdup(value));
		}
	}
379

380
	if (!starts_with(key,  "remote."))
381 382
		return 0;
	name = key + 7;
383 384 385 386 387 388

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

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

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

476 477 478 479 480
static void read_config(void)
{
	unsigned char sha1[20];
	const char *head_ref;
	int flag;
481
	if (default_remote_name) /* did this already */
482
		return;
483
	default_remote_name = "origin";
484
	current_branch = NULL;
485
	head_ref = resolve_ref_unsafe("HEAD", sha1, 0, &flag);
486
	if (head_ref && (flag & REF_ISSYMREF) &&
487 488
	    skip_prefix(head_ref, "refs/heads/", &head_ref)) {
		current_branch = make_branch(head_ref, 0);
489
	}
490
	git_config(handle_config, NULL);
491 492 493 494
	if (branch_pushremote_name) {
		free((char *)pushremote_name);
		pushremote_name = branch_pushremote_name;
	}
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
{
	int i;
521
	struct refspec *rs = xcalloc(nr_refspec, sizeof(*rs));
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
static struct remote *remote_get_1(const char *name, const char *pushremote_name)
674 675
{
	struct remote *ret;
676
	int name_given = 0;
677

678 679 680
	if (name)
		name_given = 1;
	else {
681 682 683 684 685 686 687
		if (pushremote_name) {
			name = pushremote_name;
			name_given = 1;
		} else {
			name = default_remote_name;
			name_given = explicit_default_remote_name;
		}
688
	}
689

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

706 707 708 709 710 711 712 713 714 715 716 717
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);
}

718 719 720 721 722 723 724 725 726 727 728
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;
}

729 730 731 732
int for_each_remote(each_remote_fn fn, void *priv)
{
	int i, result = 0;
	read_config();
D
Daniel Barkalow 已提交
733
	for (i = 0; i < remotes_nr && !result; i++) {
734 735 736 737
		struct remote *r = remotes[i];
		if (!r)
			continue;
		if (!r->fetch)
738 739
			r->fetch = parse_fetch_refspec(r->fetch_refspec_nr,
						       r->fetch_refspec);
740
		if (!r->push)
741 742
			r->push = parse_push_refspec(r->push_refspec_nr,
						     r->push_refspec);
743 744 745 746 747
		result = fn(r, priv);
	}
	return result;
}

748 749
static void handle_duplicate(struct ref *ref1, struct ref *ref2)
{
750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771
	if (strcmp(ref1->name, ref2->name)) {
		if (ref1->fetch_head_status != FETCH_HEAD_IGNORE &&
		    ref2->fetch_head_status != FETCH_HEAD_IGNORE) {
			die(_("Cannot fetch both %s and %s to %s"),
			    ref1->name, ref2->name, ref2->peer_ref->name);
		} else if (ref1->fetch_head_status != FETCH_HEAD_IGNORE &&
			   ref2->fetch_head_status == FETCH_HEAD_IGNORE) {
			warning(_("%s usually tracks %s, not %s"),
				ref2->peer_ref->name, ref2->name, ref1->name);
		} else if (ref1->fetch_head_status == FETCH_HEAD_IGNORE &&
			   ref2->fetch_head_status == FETCH_HEAD_IGNORE) {
			die(_("%s tracks both %s and %s"),
			    ref2->peer_ref->name, ref1->name, ref2->name);
		} else {
			/*
			 * This last possibility doesn't occur because
			 * FETCH_HEAD_IGNORE entries always appear at
			 * the end of the list.
			 */
			die(_("Internal error"));
		}
	}
772 773 774 775
	free(ref2->peer_ref);
	free(ref2);
}

776
struct ref *ref_remove_duplicates(struct ref *ref_map)
777
{
778
	struct string_list refs = STRING_LIST_INIT_NODUP;
779 780
	struct ref *retval = NULL;
	struct ref **p = &retval;
781

782 783 784 785 786
	while (ref_map) {
		struct ref *ref = ref_map;

		ref_map = ref_map->next;
		ref->next = NULL;
787

788 789 790
		if (!ref->peer_ref) {
			*p = ref;
			p = &ref->next;
791
		} else {
792 793 794 795 796
			struct string_list_item *item =
				string_list_insert(&refs, ref->peer_ref->name);

			if (item->util) {
				/* Entry already existed */
797
				handle_duplicate((struct ref *)item->util, ref);
798 799 800 801 802
			} else {
				*p = ref;
				p = &ref->next;
				item->util = ref;
			}
803 804
		}
	}
805

806
	string_list_clear(&refs, 0);
807
	return retval;
808 809
}

810
int remote_has_url(struct remote *remote, const char *url)
811 812
{
	int i;
813 814
	for (i = 0; i < remote->url_nr; i++) {
		if (!strcmp(remote->url[i], url))
815 816 817 818 819
			return 1;
	}
	return 0;
}

820 821
static int match_name_with_pattern(const char *key, const char *name,
				   const char *value, char **result)
822
{
D
Daniel Barkalow 已提交
823 824
	const char *kstar = strchr(key, '*');
	size_t klen;
825 826
	size_t ksuffixlen;
	size_t namelen;
D
Daniel Barkalow 已提交
827 828 829 830
	int ret;
	if (!kstar)
		die("Key '%s' of pattern had no '*'", key);
	klen = kstar - key;
831 832 833 834
	ksuffixlen = strlen(kstar + 1);
	namelen = strlen(name);
	ret = !strncmp(name, key, klen) && namelen >= klen + ksuffixlen &&
		!memcmp(name + namelen - ksuffixlen, kstar + 1, ksuffixlen);
835
	if (ret && value) {
D
Daniel Barkalow 已提交
836 837
		const char *vstar = strchr(value, '*');
		size_t vlen;
838
		size_t vsuffixlen;
D
Daniel Barkalow 已提交
839 840 841
		if (!vstar)
			die("Value '%s' of pattern has no '*'", value);
		vlen = vstar - value;
842 843
		vsuffixlen = strlen(vstar + 1);
		*result = xmalloc(vlen + vsuffixlen +
844
				  strlen(name) -
845 846 847 848 849 850
				  klen - ksuffixlen + 1);
		strncpy(*result, value, vlen);
		strncpy(*result + vlen,
			name + klen, namelen - klen - ksuffixlen);
		strcpy(*result + vlen + namelen - klen - ksuffixlen,
		       vstar + 1);
851
	}
852 853 854
	return ret;
}

855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880
static void query_refspecs_multiple(struct refspec *refs, int ref_count, struct refspec *query, struct string_list *results)
{
	int i;
	int find_src = !query->src;

	if (find_src && !query->dst)
		error("query_refspecs_multiple: need either src or dst");

	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;

		if (!refspec->dst)
			continue;
		if (refspec->pattern) {
			if (match_name_with_pattern(key, needle, value, result))
				string_list_append_nodup(results, *result);
		} else if (!strcmp(needle, key)) {
			string_list_append(results, value);
		}
	}
}

881
int query_refspecs(struct refspec *refs, int ref_count, struct refspec *query)
882 883
{
	int i;
884
	int find_src = !query->src;
885 886
	const char *needle = find_src ? query->dst : query->src;
	char **result = find_src ? &query->src : &query->dst;
887

888 889
	if (find_src && !query->dst)
		return error("query_refspecs: need either src or dst");
890

891 892 893 894
	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;
895

896
		if (!refspec->dst)
897
			continue;
898
		if (refspec->pattern) {
899
			if (match_name_with_pattern(key, needle, value, result)) {
900
				query->force = refspec->force;
901 902
				return 0;
			}
903 904
		} else if (!strcmp(needle, key)) {
			*result = xstrdup(value);
905
			query->force = refspec->force;
906
			return 0;
907 908 909 910 911
		}
	}
	return -1;
}

912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930
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 已提交
931 932 933 934 935 936 937 938 939 940
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;
}

941
struct ref *alloc_ref(const char *name)
942
{
943
	return alloc_ref_with_prefix("", 0, name);
944 945
}

J
Jeff King 已提交
946
struct ref *copy_ref(const struct ref *ref)
947
{
948 949 950 951 952 953 954 955 956 957 958 959
	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;
960 961
}

962 963 964 965 966 967 968 969 970 971 972 973
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;
}

974
static void free_ref(struct ref *ref)
975 976 977
{
	if (!ref)
		return;
978
	free_ref(ref->peer_ref);
979 980 981 982 983
	free(ref->remote_status);
	free(ref->symref);
	free(ref);
}

984 985 986 987 988
void free_refs(struct ref *ref)
{
	struct ref *next;
	while (ref) {
		next = ref->next;
989
		free_ref(ref);
990 991 992 993
		ref = next;
	}
}

994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014
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);
}

1015 1016 1017
int count_refspec_match(const char *pattern,
			struct ref *refs,
			struct ref **matched_ref)
1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028
{
	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);

1029
		if (!refname_match(pattern, name))
1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041
			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 &&
1042 1043
		    !starts_with(name, "refs/heads/") &&
		    !starts_with(name, "refs/tags/")) {
1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059
			/* 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) {
1060 1061
		if (matched_ref)
			*matched_ref = matched_weak;
1062 1063 1064
		return weak_match;
	}
	else {
1065 1066
		if (matched_ref)
			*matched_ref = matched;
1067 1068 1069 1070
		return match;
	}
}

1071
static void tail_link_ref(struct ref *ref, struct ref ***tail)
1072 1073
{
	**tail = ref;
1074 1075
	while (ref->next)
		ref = ref->next;
1076 1077 1078
	*tail = &ref->next;
}

1079 1080 1081 1082 1083 1084 1085
static struct ref *alloc_delete_ref(void)
{
	struct ref *ref = alloc_ref("(delete)");
	hashclr(ref->new_sha1);
	return ref;
}

1086 1087
static int try_explicit_object_name(const char *name,
				    struct ref **match)
1088 1089 1090
{
	unsigned char sha1[20];

1091 1092 1093 1094 1095 1096
	if (!*name) {
		if (match)
			*match = alloc_delete_ref();
		return 0;
	}

1097
	if (get_sha1(name, sha1))
1098 1099 1100 1101 1102 1103 1104
		return -1;

	if (match) {
		*match = alloc_ref(name);
		hashcpy((*match)->new_sha1, sha1);
	}
	return 0;
1105 1106
}

1107
static struct ref *make_linked_ref(const char *name, struct ref ***tail)
1108
{
1109
	struct ref *ret = alloc_ref(name);
1110 1111
	tail_link_ref(ret, tail);
	return ret;
1112
}
1113

1114 1115 1116 1117 1118
static char *guess_ref(const char *name, struct ref *peer)
{
	struct strbuf buf = STRBUF_INIT;
	unsigned char sha1[20];

1119
	const char *r = resolve_ref_unsafe(peer->name, sha1, 1, NULL);
1120 1121 1122
	if (!r)
		return NULL;

1123
	if (starts_with(r, "refs/heads/"))
1124
		strbuf_addstr(&buf, "refs/heads/");
1125
	else if (starts_with(r, "refs/tags/"))
1126 1127 1128 1129 1130 1131 1132 1133
		strbuf_addstr(&buf, "refs/tags/");
	else
		return NULL;

	strbuf_addstr(&buf, name);
	return strbuf_detach(&buf, NULL);
}

1134 1135 1136 1137 1138 1139 1140
static int match_explicit_lhs(struct ref *src,
			      struct refspec *rs,
			      struct ref **match,
			      int *allocated_match)
{
	switch (count_refspec_match(rs->src, src, match)) {
	case 1:
1141 1142
		if (allocated_match)
			*allocated_match = 0;
1143 1144 1145 1146 1147 1148
		return 0;
	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.
		 */
1149
		if (try_explicit_object_name(rs->src, match) < 0)
1150
			return error("src refspec %s does not match any.", rs->src);
1151 1152
		if (allocated_match)
			*allocated_match = 1;
1153 1154 1155 1156 1157 1158
		return 0;
	default:
		return error("src refspec %s matches more than one.", rs->src);
	}
}

1159 1160
static int match_explicit(struct ref *src, struct ref *dst,
			  struct ref ***dst_tail,
1161
			  struct refspec *rs)
1162
{
1163
	struct ref *matched_src, *matched_dst;
1164
	int allocated_src;
1165

1166
	const char *dst_value = rs->dst;
1167
	char *dst_guess;
1168

1169
	if (rs->pattern || rs->matching)
1170
		return 0;
1171

1172
	matched_src = matched_dst = NULL;
1173 1174
	if (match_explicit_lhs(src, rs, &matched_src, &allocated_src) < 0)
		return -1;
1175

1176
	if (!dst_value) {
1177 1178 1179
		unsigned char sha1[20];
		int flag;

1180
		dst_value = resolve_ref_unsafe(matched_src->name, sha1, 1, &flag);
1181 1182
		if (!dst_value ||
		    ((flag & REF_ISSYMREF) &&
1183
		     !starts_with(dst_value, "refs/heads/")))
1184 1185
			die("%s cannot be resolved to branch.",
			    matched_src->name);
1186
	}
1187

1188 1189 1190 1191
	switch (count_refspec_match(dst_value, dst, &matched_dst)) {
	case 1:
		break;
	case 0:
1192
		if (starts_with(dst_value, "refs/"))
1193
			matched_dst = make_linked_ref(dst_value, dst_tail);
1194 1195 1196
		else if (is_null_sha1(matched_src->new_sha1))
			error("unable to delete '%s': remote ref does not exist",
			      dst_value);
1197
		else if ((dst_guess = guess_ref(dst_value, matched_src)))
1198
			matched_dst = make_linked_ref(dst_guess, dst_tail);
1199
		else
1200 1201 1202 1203 1204 1205
			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);
1206 1207
		break;
	default:
1208
		matched_dst = NULL;
1209 1210 1211 1212
		error("dst refspec %s matches more than one.",
		      dst_value);
		break;
	}
1213 1214 1215 1216
	if (!matched_dst)
		return -1;
	if (matched_dst->peer_ref)
		return error("dst ref %s receives from more than one src.",
1217 1218
		      matched_dst->name);
	else {
1219 1220 1221
		matched_dst->peer_ref = allocated_src ?
					matched_src :
					copy_ref(matched_src);
1222
		matched_dst->force = rs->force;
1223
	}
1224
	return 0;
1225 1226 1227 1228 1229 1230 1231 1232
}

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++)
1233 1234
		errs += match_explicit(src, dst, dst_tail, &rs[i]);
	return errs;
1235 1236
}

1237
static char *get_ref_match(const struct refspec *rs, int rs_nr, const struct ref *ref,
F
Felipe Contreras 已提交
1238
		int send_mirror, int direction, const struct refspec **ret_pat)
1239
{
1240 1241
	const struct refspec *pat;
	char *name;
1242
	int i;
1243
	int matching_refs = -1;
1244
	for (i = 0; i < rs_nr; i++) {
1245 1246 1247 1248 1249 1250
		if (rs[i].matching &&
		    (matching_refs == -1 || rs[i].force)) {
			matching_refs = i;
			continue;
		}

1251 1252
		if (rs[i].pattern) {
			const char *dst_side = rs[i].dst ? rs[i].dst : rs[i].src;
F
Felipe Contreras 已提交
1253 1254 1255 1256 1257 1258
			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) {
1259 1260 1261 1262
				matching_refs = i;
				break;
			}
		}
1263
	}
1264
	if (matching_refs == -1)
1265
		return NULL;
1266 1267 1268 1269 1270 1271 1272 1273

	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.
		 */
1274
		if (!send_mirror && !starts_with(ref->name, "refs/heads/"))
1275 1276 1277 1278 1279 1280
			return NULL;
		name = xstrdup(ref->name);
	}
	if (ret_pat)
		*ret_pat = pat;
	return name;
1281 1282
}

1283 1284 1285 1286 1287 1288 1289 1290
static struct ref **tail_ref(struct ref **head)
{
	struct ref **tail = head;
	while (*tail)
		tail = &((*tail)->next);
	return tail;
}

J
Junio C Hamano 已提交
1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328
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);
1329
		if (starts_with(ref->name, "refs/tags/"))
J
Junio C Hamano 已提交
1330 1331 1332 1333 1334 1335 1336 1337
			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) {
1338
		if (!starts_with(ref->name, "refs/tags/"))
J
Junio C Hamano 已提交
1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385
			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);
}

1386 1387 1388 1389 1390 1391 1392 1393
struct ref *find_ref_by_name(const struct ref *list, const char *name)
{
	for ( ; list; list = list->next)
		if (!strcmp(list->name, name))
			return (struct ref *)list;
	return NULL;
}

1394 1395 1396 1397 1398 1399 1400 1401
static void prepare_ref_index(struct string_list *ref_index, struct ref *ref)
{
	for ( ; ref; ref = ref->next)
		string_list_append_nodup(ref_index, ref->name)->util = ref;

	sort_string_list(ref_index);
}

1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426
/*
 * Given only the set of local refs, sanity-check the set of push
 * refspecs. We can't catch all errors that match_push_refs would,
 * but we can catch some errors early before even talking to the
 * remote side.
 */
int check_push_refs(struct ref *src, int nr_refspec, const char **refspec_names)
{
	struct refspec *refspec = parse_push_refspec(nr_refspec, refspec_names);
	int ret = 0;
	int i;

	for (i = 0; i < nr_refspec; i++) {
		struct refspec *rs = refspec + i;

		if (rs->pattern || rs->matching)
			continue;

		ret |= match_explicit_lhs(src, rs, NULL, NULL);
	}

	free_refspec(nr_refspec, refspec);
	return ret;
}

1427
/*
1428 1429 1430 1431 1432 1433
 * 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).
1434
 */
1435 1436
int match_push_refs(struct ref *src, struct ref **dst,
		    int nr_refspec, const char **refspec, int flags)
1437
{
1438
	struct refspec *rs;
A
Andy Whitcroft 已提交
1439 1440
	int send_all = flags & MATCH_REFS_ALL;
	int send_mirror = flags & MATCH_REFS_MIRROR;
F
Felipe Contreras 已提交
1441
	int send_prune = flags & MATCH_REFS_PRUNE;
1442
	int errs;
1443
	static const char *default_refspec[] = { ":", NULL };
1444
	struct ref *ref, **dst_tail = tail_ref(dst);
1445
	struct string_list dst_ref_index = STRING_LIST_INIT_NODUP;
1446

1447 1448 1449 1450 1451
	if (!nr_refspec) {
		nr_refspec = 1;
		refspec = default_refspec;
	}
	rs = parse_push_refspec(nr_refspec, (const char **) refspec);
1452
	errs = match_explicit_refs(src, *dst, &dst_tail, rs, nr_refspec);
1453 1454

	/* pick the remainder */
1455
	for (ref = src; ref; ref = ref->next) {
1456
		struct string_list_item *dst_item;
1457
		struct ref *dst_peer;
1458 1459
		const struct refspec *pat = NULL;
		char *dst_name;
1460

F
Felipe Contreras 已提交
1461
		dst_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_SRC, &pat);
1462
		if (!dst_name)
1463 1464
			continue;

1465 1466 1467 1468 1469
		if (!dst_ref_index.nr)
			prepare_ref_index(&dst_ref_index, *dst);

		dst_item = string_list_lookup(&dst_ref_index, dst_name);
		dst_peer = dst_item ? dst_item->util : NULL;
1470 1471 1472 1473 1474 1475 1476 1477 1478
		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
J
Justin Lebar 已提交
1479
				 * --all or --mirror.
1480 1481
				 */
				goto free_name;
A
Andy Whitcroft 已提交
1482

1483
			/* Create a new one and link it */
1484
			dst_peer = make_linked_ref(dst_name, &dst_tail);
1485
			hashcpy(dst_peer->new_sha1, ref->new_sha1);
1486 1487
			string_list_insert(&dst_ref_index,
				dst_peer->name)->util = dst_peer;
1488
		}
1489
		dst_peer->peer_ref = copy_ref(ref);
1490
		dst_peer->force = pat->force;
1491 1492
	free_name:
		free(dst_name);
1493
	}
J
Junio C Hamano 已提交
1494

1495 1496
	string_list_clear(&dst_ref_index, 0);

J
Junio C Hamano 已提交
1497 1498 1499
	if (flags & MATCH_REFS_FOLLOW_TAGS)
		add_missing_tags(src, dst, &dst_tail);

F
Felipe Contreras 已提交
1500
	if (send_prune) {
1501
		struct string_list src_ref_index = STRING_LIST_INIT_NODUP;
F
Felipe Contreras 已提交
1502 1503 1504 1505 1506 1507 1508 1509 1510 1511
		/* 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) {
1512 1513 1514 1515
				if (!src_ref_index.nr)
					prepare_ref_index(&src_ref_index, src);
				if (!string_list_has_string(&src_ref_index,
					    src_name))
F
Felipe Contreras 已提交
1516 1517 1518 1519
					ref->peer_ref = alloc_delete_ref();
				free(src_name);
			}
		}
1520
		string_list_clear(&src_ref_index, 0);
F
Felipe Contreras 已提交
1521
	}
1522 1523
	if (errs)
		return -1;
1524 1525
	return 0;
}
1526

1527
void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
1528
			     int force_update)
1529 1530 1531 1532
{
	struct ref *ref;

	for (ref = remote_refs; ref; ref = ref->next) {
1533
		int force_ref_update = ref->force || force_update;
1534
		int reject_reason = 0;
1535

1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547
		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 已提交
1548
		/*
1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568
		 * Bypass the usual "must fast-forward" check but
		 * replace it with a weaker "the old value must be
		 * this value we observed".  If the remote ref has
		 * moved and is now different from what we expect,
		 * reject any push.
		 *
		 * It also is an error if the user told us to check
		 * with the remote-tracking branch to find the value
		 * to expect, but we did not have such a tracking
		 * branch.
		 */
		if (ref->expect_old_sha1) {
			if (ref->expect_old_no_trackback ||
			    hashcmp(ref->old_sha1, ref->old_sha1_expect))
				reject_reason = REF_STATUS_REJECT_STALE;
		}

		/*
		 * The usual "must fast-forward" rules.
		 *
1569 1570 1571
		 * Decide whether an individual refspec A:B can be
		 * pushed.  The push will succeed if any of the
		 * following are true:
1572
		 *
C
Chris Rorvick 已提交
1573
		 * (1) the remote reference B does not exist
1574
		 *
C
Chris Rorvick 已提交
1575 1576
		 * (2) the remote reference B is being removed (i.e.,
		 *     pushing :B where no source is specified)
1577
		 *
1578 1579 1580
		 * (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.
1581
		 *
C
Chris Rorvick 已提交
1582 1583
		 * (4) it is forced using the +A:B notation, or by
		 *     passing the --force argument
1584 1585
		 */

1586
		else if (!ref->deletion && !is_null_sha1(ref->old_sha1)) {
1587
			if (starts_with(ref->name, "refs/tags/"))
1588
				reject_reason = REF_STATUS_REJECT_ALREADY_EXISTS;
1589
			else if (!has_sha1_file(ref->old_sha1))
1590
				reject_reason = REF_STATUS_REJECT_FETCH_FIRST;
1591 1592
			else if (!lookup_commit_reference_gently(ref->old_sha1, 1) ||
				 !lookup_commit_reference_gently(ref->new_sha1, 1))
1593
				reject_reason = REF_STATUS_REJECT_NEEDS_FORCE;
1594
			else if (!ref_newer(ref->new_sha1, ref->old_sha1))
1595
				reject_reason = REF_STATUS_REJECT_NONFASTFORWARD;
1596
		}
1597 1598 1599 1600 1601 1602 1603 1604 1605

		/*
		 * "--force" will defeat any rejection implemented
		 * by the rules above.
		 */
		if (!force_ref_update)
			ref->status = reject_reason;
		else if (reject_reason)
			ref->forced_update = 1;
1606 1607 1608
	}
}

1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621
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;
F
Felipe Contreras 已提交
1622
			ret->merge = xcalloc(ret->merge_nr, sizeof(*ret->merge));
1623 1624 1625
			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]);
1626 1627 1628
				if (remote_find_tracking(ret->remote, ret->merge[i])
				    && !strcmp(ret->remote_name, "."))
					ret->merge[i]->dst = xstrdup(ret->merge_name[i]);
1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639
			}
		}
	}
	return ret;
}

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

1640 1641 1642
int branch_merge_matches(struct branch *branch,
		                 int i,
		                 const char *refname)
1643
{
1644
	if (!branch || i < 0 || i >= branch->merge_nr)
1645
		return 0;
1646
	return refname_match(branch->merge[i]->src, refname);
1647
}
1648

1649 1650 1651 1652 1653 1654 1655 1656 1657 1658
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);
}

1659 1660 1661 1662 1663 1664 1665
/*
 * Create and return a list of (struct ref) consisting of copies of
 * each remote_ref that matches refspec.  refspec must be a pattern.
 * Fill in the copies' peer_ref to describe the local tracking refs to
 * which they map.  Omit any references that would map to an existing
 * local symbolic ref.
 */
1666
static struct ref *get_expanded_map(const struct ref *remote_refs,
1667 1668
				    const struct refspec *refspec)
{
1669
	const struct ref *ref;
1670 1671 1672 1673
	struct ref *ret = NULL;
	struct ref **tail = &ret;

	for (ref = remote_refs; ref; ref = ref->next) {
1674 1675
		char *expn_name = NULL;

1676 1677
		if (strchr(ref->name, '^'))
			continue; /* a dereference item */
1678
		if (match_name_with_pattern(refspec->src, ref->name,
1679 1680
					    refspec->dst, &expn_name) &&
		    !ignore_symref_update(expn_name)) {
1681 1682
			struct ref *cpy = copy_ref(ref);

1683
			cpy->peer_ref = alloc_ref(expn_name);
1684 1685 1686 1687 1688
			if (refspec->force)
				cpy->peer_ref->force = 1;
			*tail = cpy;
			tail = &cpy->next;
		}
1689
		free(expn_name);
1690 1691 1692 1693 1694
	}

	return ret;
}

1695
static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
1696
{
1697
	const struct ref *ref;
1698
	for (ref = refs; ref; ref = ref->next) {
1699
		if (refname_match(name, ref->name))
1700 1701 1702 1703 1704
			return ref;
	}
	return NULL;
}

1705
struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
1706
{
1707
	const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
1708 1709

	if (!ref)
1710
		return NULL;
1711 1712 1713 1714 1715 1716

	return copy_ref(ref);
}

static struct ref *get_local_ref(const char *name)
{
1717
	if (!name || name[0] == '\0')
1718 1719
		return NULL;

1720
	if (starts_with(name, "refs/"))
1721
		return alloc_ref(name);
1722

1723 1724 1725
	if (starts_with(name, "heads/") ||
	    starts_with(name, "tags/") ||
	    starts_with(name, "remotes/"))
R
René Scharfe 已提交
1726
		return alloc_ref_with_prefix("refs/", 5, name);
1727

R
René Scharfe 已提交
1728
	return alloc_ref_with_prefix("refs/heads/", 11, name);
1729 1730
}

1731
int get_fetch_map(const struct ref *remote_refs,
1732
		  const struct refspec *refspec,
1733 1734
		  struct ref ***tail,
		  int missing_ok)
1735
{
D
Daniel Barkalow 已提交
1736
	struct ref *ref_map, **rmp;
1737 1738 1739 1740

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

1743 1744 1745 1746 1747 1748
		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);
		}
1749 1750 1751 1752 1753 1754 1755
		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;
		}
1756 1757
	}

D
Daniel Barkalow 已提交
1758 1759
	for (rmp = &ref_map; *rmp; ) {
		if ((*rmp)->peer_ref) {
1760
			if (!starts_with((*rmp)->peer_ref->name, "refs/") ||
1761
			    check_refname_format((*rmp)->peer_ref->name, 0)) {
D
Daniel Barkalow 已提交
1762 1763 1764 1765 1766 1767 1768 1769 1770 1771
				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);
1772 1773
	}

1774 1775
	if (ref_map)
		tail_link_ref(ref_map, tail);
1776 1777 1778

	return 0;
}
1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790

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

1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808
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;

1809 1810
	/*
	 * Both new and old must be commit-ish and new is descendant of
1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840
	 * 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;
}

1841
/*
1842 1843 1844 1845 1846
 * Compare a branch with its upstream, and save their differences (number
 * of commits) in *num_ours and *num_theirs.
 *
 * Return 0 if branch has no upstream (no base), -1 if upstream is missing
 * (with "gone" base), otherwise 1 (with base).
1847 1848 1849 1850 1851 1852 1853 1854 1855 1856
 */
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;

1857
	/* Cannot stat unless we are marked to build on top of somebody else. */
1858 1859 1860 1861
	if (!branch ||
	    !branch->merge || !branch->merge[0] || !branch->merge[0]->dst)
		return 0;

1862
	/* Cannot stat if what we used to build on no longer exists */
1863
	base = branch->merge[0]->dst;
1864
	if (read_ref(base, sha1))
1865
		return -1;
1866
	theirs = lookup_commit_reference(sha1);
1867
	if (!theirs)
1868
		return -1;
1869

1870
	if (read_ref(branch->refname, sha1))
1871
		return -1;
1872
	ours = lookup_commit_reference(sha1);
1873
	if (!ours)
1874
		return -1;
1875 1876

	/* are we the same? */
1877 1878 1879 1880
	if (theirs == ours) {
		*num_theirs = *num_ours = 0;
		return 1;
	}
1881

1882
	/* Run "rev-list --left-right ours...theirs" internally... */
1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909
	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)++;
	}
1910 1911 1912 1913

	/* clear object flags smudged by the above traversal */
	clear_commit_marks(ours, ALL_REV_FLAGS);
	clear_commit_marks(theirs, ALL_REV_FLAGS);
1914 1915 1916 1917 1918 1919 1920 1921
	return 1;
}

/*
 * Return true when there is anything to report, otherwise false.
 */
int format_tracking_info(struct branch *branch, struct strbuf *sb)
{
1922
	int ours, theirs;
1923
	const char *base;
1924
	int upstream_is_gone = 0;
1925

1926 1927 1928
	switch (stat_tracking_info(branch, &ours, &theirs)) {
	case 0:
		/* no base */
1929
		return 0;
1930 1931 1932 1933 1934 1935 1936 1937
	case -1:
		/* with "gone" base */
		upstream_is_gone = 1;
		break;
	default:
		/* with base */
		break;
	}
1938 1939

	base = branch->merge[0]->dst;
1940
	base = shorten_unambiguous_ref(base, 0);
1941 1942 1943 1944 1945 1946 1947
	if (upstream_is_gone) {
		strbuf_addf(sb,
			_("Your branch is based on '%s', but the upstream is gone.\n"),
			base);
		if (advice_status_hints)
			strbuf_addf(sb,
				_("  (use \"git branch --unset-upstream\" to fixup)\n"));
1948 1949 1950 1951
	} else if (!ours && !theirs) {
		strbuf_addf(sb,
			_("Your branch is up-to-date with '%s'.\n"),
			base);
1952
	} else if (!theirs) {
1953 1954 1955
		strbuf_addf(sb,
			Q_("Your branch is ahead of '%s' by %d commit.\n",
			   "Your branch is ahead of '%s' by %d commits.\n",
1956 1957
			   ours),
			base, ours);
1958 1959 1960
		if (advice_status_hints)
			strbuf_addf(sb,
				_("  (use \"git push\" to publish your local commits)\n"));
1961
	} else if (!ours) {
1962 1963 1964 1965 1966
		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",
1967 1968
			   theirs),
			base, theirs);
1969 1970 1971
		if (advice_status_hints)
			strbuf_addf(sb,
				_("  (use \"git pull\" to update your local branch)\n"));
1972
	} else {
1973 1974 1975 1976 1977 1978 1979
		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",
1980 1981
			   theirs),
			base, ours, theirs);
1982 1983 1984
		if (advice_status_hints)
			strbuf_addf(sb,
				_("  (use \"git pull\" to merge the remote branch into yours)\n"));
1985
	}
1986 1987
	return 1;
}
1988 1989 1990 1991 1992 1993 1994 1995

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 */
1996
	if (check_refname_format(refname + 5, 0))
1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
		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)
{
2010
	struct ref *local_refs = NULL, **local_tail = &local_refs;
2011 2012 2013
	for_each_ref(one_local_ref, &local_tail);
	return local_refs;
}
J
Jay Soffian 已提交
2014

2015 2016 2017
struct ref *guess_remote_head(const struct ref *head,
			      const struct ref *refs,
			      int all)
J
Jay Soffian 已提交
2018 2019
{
	const struct ref *r;
2020 2021
	struct ref *list = NULL;
	struct ref **tail = &list;
J
Jay Soffian 已提交
2022

2023
	if (!head)
J
Jay Soffian 已提交
2024 2025
		return NULL;

2026 2027 2028 2029 2030 2031 2032 2033
	/*
	 * 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 已提交
2034
	/* If refs/heads/master could be right, it is. */
2035 2036 2037 2038 2039
	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 已提交
2040 2041

	/* Look for another ref that points there */
2042
	for (r = refs; r; r = r->next) {
2043
		if (r != head &&
2044
		    starts_with(r->name, "refs/heads/") &&
2045
		    !hashcmp(r->old_sha1, head->old_sha1)) {
2046 2047 2048 2049 2050 2051
			*tail = copy_ref(r);
			tail = &((*tail)->next);
			if (!all)
				break;
		}
	}
J
Jay Soffian 已提交
2052

2053
	return list;
J
Jay Soffian 已提交
2054
}
2055 2056 2057 2058

struct stale_heads_info {
	struct string_list *ref_names;
	struct ref **stale_refs_tail;
2059 2060
	struct refspec *refs;
	int ref_count;
2061 2062 2063 2064 2065 2066
};

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;
2067
	struct string_list matches = STRING_LIST_INIT_DUP;
2068
	struct refspec query;
2069
	int i, stale = 1;
2070 2071 2072
	memset(&query, 0, sizeof(struct refspec));
	query.dst = (char *)refname;

2073 2074 2075
	query_refspecs_multiple(info->refs, info->ref_count, &query, &matches);
	if (matches.nr == 0)
		goto clean_exit; /* No matches */
2076 2077 2078 2079

	/*
	 * 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
2080 2081 2082
	 * remote, we consider it to be stale. In order to deal with
	 * overlapping refspecs, we need to go over all of the
	 * matching refs.
2083
	 */
2084 2085 2086 2087 2088 2089 2090 2091
	if (flags & REF_ISSYMREF)
		goto clean_exit;

	for (i = 0; stale && i < matches.nr; i++)
		if (string_list_has_string(info->ref_names, matches.items[i].string))
			stale = 0;

	if (stale) {
2092 2093
		struct ref *ref = make_linked_ref(refname, &info->stale_refs_tail);
		hashcpy(ref->new_sha1, sha1);
2094
	}
2095

2096 2097
clean_exit:
	string_list_clear(&matches, 0);
2098 2099 2100
	return 0;
}

2101
struct ref *get_stale_heads(struct refspec *refs, int ref_count, struct ref *fetch_map)
2102 2103
{
	struct ref *ref, *stale_refs = NULL;
2104
	struct string_list ref_names = STRING_LIST_INIT_NODUP;
2105 2106 2107
	struct stale_heads_info info;
	info.ref_names = &ref_names;
	info.stale_refs_tail = &stale_refs;
2108 2109
	info.refs = refs;
	info.ref_count = ref_count;
2110
	for (ref = fetch_map; ref; ref = ref->next)
2111
		string_list_append(&ref_names, ref->name);
2112 2113 2114 2115 2116
	sort_string_list(&ref_names);
	for_each_ref(get_stale_heads_cb, &info);
	string_list_clear(&ref_names, 0);
	return stale_refs;
}
2117 2118 2119 2120 2121 2122 2123 2124 2125 2126 2127 2128 2129 2130 2131 2132 2133 2134 2135 2136 2137 2138 2139 2140 2141 2142 2143 2144 2145 2146 2147 2148 2149 2150 2151 2152 2153 2154 2155 2156 2157 2158 2159 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172 2173

/*
 * Compare-and-swap
 */
void clear_cas_option(struct push_cas_option *cas)
{
	int i;

	for (i = 0; i < cas->nr; i++)
		free(cas->entry[i].refname);
	free(cas->entry);
	memset(cas, 0, sizeof(*cas));
}

static struct push_cas *add_cas_entry(struct push_cas_option *cas,
				      const char *refname,
				      size_t refnamelen)
{
	struct push_cas *entry;
	ALLOC_GROW(cas->entry, cas->nr + 1, cas->alloc);
	entry = &cas->entry[cas->nr++];
	memset(entry, 0, sizeof(*entry));
	entry->refname = xmemdupz(refname, refnamelen);
	return entry;
}

int parse_push_cas_option(struct push_cas_option *cas, const char *arg, int unset)
{
	const char *colon;
	struct push_cas *entry;

	if (unset) {
		/* "--no-<option>" */
		clear_cas_option(cas);
		return 0;
	}

	if (!arg) {
		/* just "--<option>" */
		cas->use_tracking_for_rest = 1;
		return 0;
	}

	/* "--<option>=refname" or "--<option>=refname:value" */
	colon = strchrnul(arg, ':');
	entry = add_cas_entry(cas, arg, colon - arg);
	if (!*colon)
		entry->use_tracking = 1;
	else if (get_sha1(colon + 1, entry->expect))
		return error("cannot parse expected object name '%s'", colon + 1);
	return 0;
}

int parseopt_push_cas_option(const struct option *opt, const char *arg, int unset)
{
	return parse_push_cas_option(opt->value, arg, unset);
}
2174 2175 2176 2177 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 2190 2191 2192 2193 2194 2195 2196 2197 2198 2199 2200 2201 2202 2203 2204 2205 2206 2207

int is_empty_cas(const struct push_cas_option *cas)
{
	return !cas->use_tracking_for_rest && !cas->nr;
}

/*
 * Look at remote.fetch refspec and see if we have a remote
 * tracking branch for the refname there.  Fill its current
 * value in sha1[].
 * If we cannot do so, return negative to signal an error.
 */
static int remote_tracking(struct remote *remote, const char *refname,
			   unsigned char sha1[20])
{
	char *dst;

	dst = apply_refspecs(remote->fetch, remote->fetch_refspec_nr, refname);
	if (!dst)
		return -1; /* no tracking ref for refname at remote */
	if (read_ref(dst, sha1))
		return -1; /* we know what the tracking ref is but we cannot read it */
	return 0;
}

static void apply_cas(struct push_cas_option *cas,
		      struct remote *remote,
		      struct ref *ref)
{
	int i;

	/* Find an explicit --<option>=<name>[:<value>] entry */
	for (i = 0; i < cas->nr; i++) {
		struct push_cas *entry = &cas->entry[i];
2208
		if (!refname_match(entry->refname, ref->name))
2209 2210 2211 2212 2213 2214 2215 2216 2217 2218 2219 2220 2221 2222 2223 2224 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234
			continue;
		ref->expect_old_sha1 = 1;
		if (!entry->use_tracking)
			hashcpy(ref->old_sha1_expect, cas->entry[i].expect);
		else if (remote_tracking(remote, ref->name, ref->old_sha1_expect))
			ref->expect_old_no_trackback = 1;
		return;
	}

	/* Are we using "--<option>" to cover all? */
	if (!cas->use_tracking_for_rest)
		return;

	ref->expect_old_sha1 = 1;
	if (remote_tracking(remote, ref->name, ref->old_sha1_expect))
		ref->expect_old_no_trackback = 1;
}

void apply_push_cas(struct push_cas_option *cas,
		    struct remote *remote,
		    struct ref *remote_refs)
{
	struct ref *ref;
	for (ref = remote_refs; ref; ref = ref->next)
		apply_cas(cas, remote, ref);
}