remote.c 58.9 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
static struct hashmap remotes_hash;
46

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

static struct branch *current_branch;
52
static const char *pushremote_name;
53

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

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

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

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

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

88
	return xstrfmt("%s%s", r->rewrite[longest_i]->base, url + longest->len);
89 90
}

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

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

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

113 114 115 116 117 118
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;
}

119 120 121 122 123 124 125 126 127 128 129 130 131
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);
}

132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150
struct remotes_hash_key {
	const char *str;
	int len;
};

static int remotes_hash_cmp(const struct remote *a, const struct remote *b, const struct remotes_hash_key *key)
{
	if (key)
		return strncmp(a->name, key->str, key->len) || a->name[key->len];
	else
		return strcmp(a->name, b->name);
}

static inline void init_remotes_hash(void)
{
	if (!remotes_hash.cmpfn)
		hashmap_init(&remotes_hash, (hashmap_cmp_fn)remotes_hash_cmp, 0);
}

151 152
static struct remote *make_remote(const char *name, int len)
{
153 154 155
	struct remote *ret, *replaced;
	struct remotes_hash_key lookup;
	struct hashmap_entry lookup_entry;
156

157 158 159 160 161 162 163 164 165 166
	if (!len)
		len = strlen(name);

	init_remotes_hash();
	lookup.str = name;
	lookup.len = len;
	hashmap_entry_init(&lookup_entry, memhash(name, len));

	if ((ret = hashmap_get(&remotes_hash, &lookup_entry, &lookup)) != NULL)
		return ret;
167

D
Daniel Barkalow 已提交
168
	ret = xcalloc(1, sizeof(struct remote));
169
	ret->prune = -1;  /* unspecified */
D
Daniel Barkalow 已提交
170 171
	ALLOC_GROW(remotes, remotes_nr + 1, remotes_alloc);
	remotes[remotes_nr++] = ret;
172 173 174 175 176
	ret->name = xstrndup(name, len);

	hashmap_entry_init(ret, lookup_entry.hash);
	replaced = hashmap_put(&remotes_hash, ret);
	assert(replaced == NULL);  /* no previous entry overwritten */
D
Daniel Barkalow 已提交
177
	return ret;
178 179
}

180 181
static void add_merge(struct branch *branch, const char *name)
{
D
Daniel Barkalow 已提交
182 183 184
	ALLOC_GROW(branch->merge_name, branch->merge_nr + 1,
		   branch->merge_alloc);
	branch->merge_name[branch->merge_nr++] = name;
185 186 187 188
}

static struct branch *make_branch(const char *name, int len)
{
D
Daniel Barkalow 已提交
189 190
	struct branch *ret;
	int i;
191

D
Daniel Barkalow 已提交
192 193 194 195 196
	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];
197 198
	}

D
Daniel Barkalow 已提交
199 200 201
	ALLOC_GROW(branches, branches_nr + 1, branches_alloc);
	ret = xcalloc(1, sizeof(struct branch));
	branches[branches_nr++] = ret;
202
	if (len)
D
Daniel Barkalow 已提交
203
		ret->name = xstrndup(name, len);
204
	else
D
Daniel Barkalow 已提交
205
		ret->name = xstrdup(name);
206
	ret->refname = xstrfmt("refs/heads/%s", ret->name);
207

D
Daniel Barkalow 已提交
208
	return ret;
209 210
}

211
static struct rewrite *make_rewrite(struct rewrites *r, const char *base, int len)
212 213 214 215
{
	struct rewrite *ret;
	int i;

216
	for (i = 0; i < r->rewrite_nr; i++) {
217
		if (len
218 219 220 221
		    ? (len == r->rewrite[i]->baselen &&
		       !strncmp(base, r->rewrite[i]->base, len))
		    : !strcmp(base, r->rewrite[i]->base))
			return r->rewrite[i];
222 223
	}

224
	ALLOC_GROW(r->rewrite, r->rewrite_nr + 1, r->rewrite_alloc);
225
	ret = xcalloc(1, sizeof(struct rewrite));
226
	r->rewrite[r->rewrite_nr++] = ret;
227
	if (len) {
228
		ret->base = xstrndup(base, len);
229 230 231
		ret->baselen = len;
	}
	else {
232
		ret->base = xstrdup(base);
233 234
		ret->baselen = strlen(base);
	}
235 236 237 238 239 240
	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);
241 242 243
	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++;
244 245
}

246 247 248 249 250 251
static void read_remotes_file(struct remote *remote)
{
	FILE *f = fopen(git_path("remotes/%s", remote->name), "r");

	if (!f)
		return;
252
	remote->origin = REMOTE_REMOTES;
253 254 255 256
	while (fgets(buffer, BUF_SIZE, f)) {
		int value_list;
		char *s, *p;

257
		if (starts_with(buffer, "URL:")) {
258 259
			value_list = 0;
			s = buffer + 4;
260
		} else if (starts_with(buffer, "Push:")) {
261 262
			value_list = 1;
			s = buffer + 5;
263
		} else if (starts_with(buffer, "Pull:")) {
264 265
			value_list = 2;
			s = buffer + 5;
266 267 268 269 270 271 272 273 274 275 276 277 278 279
		} else
			continue;

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

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

		switch (value_list) {
		case 0:
280
			add_url_alias(remote, xstrdup(s));
281 282 283 284
			break;
		case 1:
			add_push_refspec(remote, xstrdup(s));
			break;
285 286 287
		case 2:
			add_fetch_refspec(remote, xstrdup(s));
			break;
288 289 290 291 292 293 294
		}
	}
	fclose(f);
}

static void read_branches_file(struct remote *remote)
{
295
	char *frag;
296 297
	struct strbuf buf = STRBUF_INIT;
	FILE *f = fopen(git_path("branches/%s", remote->name), "r");
298 299 300

	if (!f)
		return;
301 302 303 304 305

	strbuf_getline(&buf, f, '\n');
	strbuf_trim(&buf);
	if (!buf.len) {
		strbuf_release(&buf);
306
		return;
307 308
	}

309
	remote->origin = REMOTE_BRANCHES;
310 311

	/*
312
	 * The branches file would have URL and optionally
313
	 * #branch specified.  The "master" (or specified) branch is
314 315
	 * fetched and stored in the local branch matching the
	 * remote name.
316
	 */
317 318
	frag = strchr(buf.buf, '#');
	if (frag)
319
		*(frag++) = '\0';
320 321 322 323 324 325
	else
		frag = "master";

	add_url_alias(remote, strbuf_detach(&buf, NULL));
	add_fetch_refspec(remote, xstrfmt("refs/heads/%s:refs/heads/%s",
					  frag, remote->name));
326

327 328 329 330
	/*
	 * Cogito compatible push: push current HEAD to remote #branch
	 * (master if missing)
	 */
331
	add_push_refspec(remote, xstrfmt("HEAD:refs/heads/%s", frag));
332
	remote->fetch_tags = 1; /* always auto-follow */
333 334
}

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

377
	if (!starts_with(key,  "remote."))
378 379
		return 0;
	name = key + 7;
380 381 382 383 384 385

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

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

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

473 474
static void read_config(void)
{
475
	static int loaded;
476 477 478
	unsigned char sha1[20];
	const char *head_ref;
	int flag;
479 480

	if (loaded)
481
		return;
482 483
	loaded = 1;

484
	current_branch = NULL;
485
	head_ref = resolve_ref_unsafe("HEAD", 0, sha1, &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
	alias_all_urls();
492 493
}

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

	if (!refspec)
		return;

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

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

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

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

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

		rhs = strrchr(lhs, ':');
534 535 536

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

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

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

559 560
		rs[i].pattern = is_glob;
		rs[i].src = xstrndup(lhs, llen);
561
		flags = REFNAME_ALLOW_ONELEVEL | (is_glob ? REFNAME_REFSPEC_PATTERN : 0);
562 563

		if (fetch) {
564 565
			unsigned char unused[40];

566
			/* LHS */
567
			if (!*rs[i].src)
568
				; /* empty is ok; it means "HEAD" */
569 570
			else if (llen == 40 && !get_sha1_hex(rs[i].src, unused))
				rs[i].exact_sha1 = 1; /* ok */
571 572 573
			else if (!check_refname_format(rs[i].src, flags))
				; /* valid looking ref is ok */
			else
574
				goto invalid;
575
			/* RHS */
576
			if (!rs[i].dst)
577
				; /* missing is ok; it is the same as empty */
578
			else if (!*rs[i].dst)
579 580 581 582
				; /* empty is ok; it means "do not store" */
			else if (!check_refname_format(rs[i].dst, flags))
				; /* valid looking ref is ok */
			else
583
				goto invalid;
584 585 586 587 588 589 590 591 592 593 594
		} else {
			/*
			 * LHS
			 * - empty is allowed; it means delete.
			 * - when wildcarded, it must be a valid looking ref.
			 * - otherwise, it must be an extended SHA-1, but
			 *   there is no existing way to validate this.
			 */
			if (!*rs[i].src)
				; /* empty is ok */
			else if (is_glob) {
595
				if (check_refname_format(rs[i].src, flags))
596 597 598 599 600 601 602 603 604 605 606 607
					goto invalid;
			}
			else
				; /* anything goes, for now */
			/*
			 * RHS
			 * - missing is allowed, but LHS then must be a
			 *   valid looking ref.
			 * - empty is not allowed.
			 * - otherwise it must be a valid looking ref.
			 */
			if (!rs[i].dst) {
608
				if (check_refname_format(rs[i].src, flags))
609 610 611 612
					goto invalid;
			} else if (!*rs[i].dst) {
				goto invalid;
			} else {
613
				if (check_refname_format(rs[i].dst, flags))
614 615
					goto invalid;
			}
D
Daniel Barkalow 已提交
616
		}
617 618
	}
	return rs;
619 620

 invalid:
621
	if (verify) {
622 623 624 625 626 627
		/*
		 * nr_refspec must be greater than zero and i must be valid
		 * since it is only possible to reach this point from within
		 * the for loop above.
		 */
		free_refspecs(rs, i+1);
628 629
		return NULL;
	}
630 631 632
	die("Invalid refspec '%s'", refspec[i]);
}

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

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

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

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

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

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

669 670 671 672 673 674 675 676 677 678 679 680
const char *remote_for_branch(struct branch *branch, int *explicit)
{
	if (branch && branch->remote_name) {
		if (explicit)
			*explicit = 1;
		return branch->remote_name;
	}
	if (explicit)
		*explicit = 0;
	return "origin";
}

681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697
const char *pushremote_for_branch(struct branch *branch, int *explicit)
{
	if (branch && branch->pushremote_name) {
		if (explicit)
			*explicit = 1;
		return branch->pushremote_name;
	}
	if (pushremote_name) {
		if (explicit)
			*explicit = 1;
		return pushremote_name;
	}
	return remote_for_branch(branch, explicit);
}

static struct remote *remote_get_1(const char *name,
				   const char *(*get_default)(struct branch *, int *))
698 699
{
	struct remote *ret;
700
	int name_given = 0;
701

702 703
	read_config();

704 705
	if (name)
		name_given = 1;
706 707
	else
		name = get_default(current_branch, &name_given);
708

709
	ret = make_remote(name, 0);
710
	if (valid_remote_nick(name)) {
711
		if (!valid_remote(ret))
712
			read_remotes_file(ret);
713
		if (!valid_remote(ret))
714 715
			read_branches_file(ret);
	}
716
	if (name_given && !valid_remote(ret))
717
		add_url_alias(ret, name);
718
	if (!valid_remote(ret))
719
		return NULL;
720 721
	ret->fetch = parse_fetch_refspec(ret->fetch_refspec_nr, ret->fetch_refspec);
	ret->push = parse_push_refspec(ret->push_refspec_nr, ret->push_refspec);
722 723
	return ret;
}
724

725 726
struct remote *remote_get(const char *name)
{
727
	return remote_get_1(name, remote_for_branch);
728 729 730 731
}

struct remote *pushremote_get(const char *name)
{
732
	return remote_get_1(name, pushremote_for_branch);
733 734
}

735 736
int remote_is_configured(const char *name)
{
737 738
	struct remotes_hash_key lookup;
	struct hashmap_entry lookup_entry;
739 740
	read_config();

741 742 743 744 745 746
	init_remotes_hash();
	lookup.str = name;
	lookup.len = strlen(name);
	hashmap_entry_init(&lookup_entry, memhash(name, lookup.len));

	return hashmap_get(&remotes_hash, &lookup_entry, &lookup) != NULL;
747 748
}

749 750 751 752
int for_each_remote(each_remote_fn fn, void *priv)
{
	int i, result = 0;
	read_config();
D
Daniel Barkalow 已提交
753
	for (i = 0; i < remotes_nr && !result; i++) {
754 755 756 757
		struct remote *r = remotes[i];
		if (!r)
			continue;
		if (!r->fetch)
758 759
			r->fetch = parse_fetch_refspec(r->fetch_refspec_nr,
						       r->fetch_refspec);
760
		if (!r->push)
761 762
			r->push = parse_push_refspec(r->push_refspec_nr,
						     r->push_refspec);
763 764 765 766 767
		result = fn(r, priv);
	}
	return result;
}

768 769
static void handle_duplicate(struct ref *ref1, struct ref *ref2)
{
770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791
	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"));
		}
	}
792 793 794 795
	free(ref2->peer_ref);
	free(ref2);
}

796
struct ref *ref_remove_duplicates(struct ref *ref_map)
797
{
798
	struct string_list refs = STRING_LIST_INIT_NODUP;
799 800
	struct ref *retval = NULL;
	struct ref **p = &retval;
801

802 803 804 805 806
	while (ref_map) {
		struct ref *ref = ref_map;

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

808 809 810
		if (!ref->peer_ref) {
			*p = ref;
			p = &ref->next;
811
		} else {
812 813 814 815 816
			struct string_list_item *item =
				string_list_insert(&refs, ref->peer_ref->name);

			if (item->util) {
				/* Entry already existed */
817
				handle_duplicate((struct ref *)item->util, ref);
818 819 820 821 822
			} else {
				*p = ref;
				p = &ref->next;
				item->util = ref;
			}
823 824
		}
	}
825

826
	string_list_clear(&refs, 0);
827
	return retval;
828 829
}

830
int remote_has_url(struct remote *remote, const char *url)
831 832
{
	int i;
833 834
	for (i = 0; i < remote->url_nr; i++) {
		if (!strcmp(remote->url[i], url))
835 836 837 838 839
			return 1;
	}
	return 0;
}

840 841
static int match_name_with_pattern(const char *key, const char *name,
				   const char *value, char **result)
842
{
D
Daniel Barkalow 已提交
843 844
	const char *kstar = strchr(key, '*');
	size_t klen;
845 846
	size_t ksuffixlen;
	size_t namelen;
D
Daniel Barkalow 已提交
847 848 849 850
	int ret;
	if (!kstar)
		die("Key '%s' of pattern had no '*'", key);
	klen = kstar - key;
851 852 853 854
	ksuffixlen = strlen(kstar + 1);
	namelen = strlen(name);
	ret = !strncmp(name, key, klen) && namelen >= klen + ksuffixlen &&
		!memcmp(name + namelen - ksuffixlen, kstar + 1, ksuffixlen);
855
	if (ret && value) {
856
		struct strbuf sb = STRBUF_INIT;
D
Daniel Barkalow 已提交
857 858 859
		const char *vstar = strchr(value, '*');
		if (!vstar)
			die("Value '%s' of pattern has no '*'", value);
860 861 862 863
		strbuf_add(&sb, value, vstar - value);
		strbuf_add(&sb, name + klen, namelen - klen - ksuffixlen);
		strbuf_addstr(&sb, vstar + 1);
		*result = strbuf_detach(&sb, NULL);
864
	}
865 866 867
	return ret;
}

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

894
int query_refspecs(struct refspec *refs, int ref_count, struct refspec *query)
895 896
{
	int i;
897
	int find_src = !query->src;
898 899
	const char *needle = find_src ? query->dst : query->src;
	char **result = find_src ? &query->src : &query->dst;
900

901 902
	if (find_src && !query->dst)
		return error("query_refspecs: need either src or dst");
903

904 905 906 907
	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;
908

909
		if (!refspec->dst)
910
			continue;
911
		if (refspec->pattern) {
912
			if (match_name_with_pattern(key, needle, value, result)) {
913
				query->force = refspec->force;
914 915
				return 0;
			}
916 917
		} else if (!strcmp(needle, key)) {
			*result = xstrdup(value);
918
			query->force = refspec->force;
919
			return 0;
920 921 922 923 924
		}
	}
	return -1;
}

925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943
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 已提交
944 945 946 947 948 949 950 951 952 953
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;
}

954
struct ref *alloc_ref(const char *name)
955
{
956
	return alloc_ref_with_prefix("", 0, name);
957 958
}

J
Jeff King 已提交
959
struct ref *copy_ref(const struct ref *ref)
960
{
961 962 963 964 965 966 967 968
	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;
969 970
	cpy->symref = xstrdup_or_null(ref->symref);
	cpy->remote_status = xstrdup_or_null(ref->remote_status);
971 972
	cpy->peer_ref = copy_ref(ref->peer_ref);
	return cpy;
973 974
}

975 976 977 978 979 980 981 982 983 984 985 986
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;
}

987
static void free_ref(struct ref *ref)
988 989 990
{
	if (!ref)
		return;
991
	free_ref(ref->peer_ref);
992 993 994 995 996
	free(ref->remote_status);
	free(ref->symref);
	free(ref);
}

997 998 999 1000 1001
void free_refs(struct ref *ref)
{
	struct ref *next;
	while (ref) {
		next = ref->next;
1002
		free_ref(ref);
1003 1004 1005 1006
		ref = next;
	}
}

1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027
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);
}

1028 1029 1030
int count_refspec_match(const char *pattern,
			struct ref *refs,
			struct ref **matched_ref)
1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041
{
	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);

1042
		if (!refname_match(pattern, name))
1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054
			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 &&
1055 1056
		    !starts_with(name, "refs/heads/") &&
		    !starts_with(name, "refs/tags/")) {
1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072
			/* 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) {
1073 1074
		if (matched_ref)
			*matched_ref = matched_weak;
1075 1076 1077
		return weak_match;
	}
	else {
1078 1079
		if (matched_ref)
			*matched_ref = matched;
1080 1081 1082 1083
		return match;
	}
}

1084
static void tail_link_ref(struct ref *ref, struct ref ***tail)
1085 1086
{
	**tail = ref;
1087 1088
	while (ref->next)
		ref = ref->next;
1089 1090 1091
	*tail = &ref->next;
}

1092 1093 1094 1095 1096 1097 1098
static struct ref *alloc_delete_ref(void)
{
	struct ref *ref = alloc_ref("(delete)");
	hashclr(ref->new_sha1);
	return ref;
}

1099 1100
static int try_explicit_object_name(const char *name,
				    struct ref **match)
1101 1102 1103
{
	unsigned char sha1[20];

1104 1105 1106 1107 1108 1109
	if (!*name) {
		if (match)
			*match = alloc_delete_ref();
		return 0;
	}

1110
	if (get_sha1(name, sha1))
1111 1112 1113 1114 1115 1116 1117
		return -1;

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

1120
static struct ref *make_linked_ref(const char *name, struct ref ***tail)
1121
{
1122
	struct ref *ret = alloc_ref(name);
1123 1124
	tail_link_ref(ret, tail);
	return ret;
1125
}
1126

1127 1128 1129 1130 1131
static char *guess_ref(const char *name, struct ref *peer)
{
	struct strbuf buf = STRBUF_INIT;
	unsigned char sha1[20];

1132 1133
	const char *r = resolve_ref_unsafe(peer->name, RESOLVE_REF_READING,
					   sha1, NULL);
1134 1135 1136
	if (!r)
		return NULL;

1137
	if (starts_with(r, "refs/heads/"))
1138
		strbuf_addstr(&buf, "refs/heads/");
1139
	else if (starts_with(r, "refs/tags/"))
1140 1141 1142 1143 1144 1145 1146 1147
		strbuf_addstr(&buf, "refs/tags/");
	else
		return NULL;

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

1148 1149 1150 1151 1152 1153 1154
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:
1155 1156
		if (allocated_match)
			*allocated_match = 0;
1157 1158 1159 1160 1161 1162
		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.
		 */
1163
		if (try_explicit_object_name(rs->src, match) < 0)
1164
			return error("src refspec %s does not match any.", rs->src);
1165 1166
		if (allocated_match)
			*allocated_match = 1;
1167 1168 1169 1170 1171 1172
		return 0;
	default:
		return error("src refspec %s matches more than one.", rs->src);
	}
}

1173 1174
static int match_explicit(struct ref *src, struct ref *dst,
			  struct ref ***dst_tail,
1175
			  struct refspec *rs)
1176
{
1177
	struct ref *matched_src, *matched_dst;
1178
	int allocated_src;
1179

1180
	const char *dst_value = rs->dst;
1181
	char *dst_guess;
1182

1183
	if (rs->pattern || rs->matching)
1184
		return 0;
1185

1186
	matched_src = matched_dst = NULL;
1187 1188
	if (match_explicit_lhs(src, rs, &matched_src, &allocated_src) < 0)
		return -1;
1189

1190
	if (!dst_value) {
1191 1192 1193
		unsigned char sha1[20];
		int flag;

1194 1195 1196
		dst_value = resolve_ref_unsafe(matched_src->name,
					       RESOLVE_REF_READING,
					       sha1, &flag);
1197 1198
		if (!dst_value ||
		    ((flag & REF_ISSYMREF) &&
1199
		     !starts_with(dst_value, "refs/heads/")))
1200 1201
			die("%s cannot be resolved to branch.",
			    matched_src->name);
1202
	}
1203

1204 1205 1206 1207
	switch (count_refspec_match(dst_value, dst, &matched_dst)) {
	case 1:
		break;
	case 0:
1208
		if (starts_with(dst_value, "refs/"))
1209
			matched_dst = make_linked_ref(dst_value, dst_tail);
1210 1211 1212
		else if (is_null_sha1(matched_src->new_sha1))
			error("unable to delete '%s': remote ref does not exist",
			      dst_value);
1213
		else if ((dst_guess = guess_ref(dst_value, matched_src)))
1214
			matched_dst = make_linked_ref(dst_guess, dst_tail);
1215
		else
1216 1217 1218 1219 1220 1221
			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);
1222 1223
		break;
	default:
1224
		matched_dst = NULL;
1225 1226 1227 1228
		error("dst refspec %s matches more than one.",
		      dst_value);
		break;
	}
1229 1230 1231 1232
	if (!matched_dst)
		return -1;
	if (matched_dst->peer_ref)
		return error("dst ref %s receives from more than one src.",
1233 1234
		      matched_dst->name);
	else {
1235 1236 1237
		matched_dst->peer_ref = allocated_src ?
					matched_src :
					copy_ref(matched_src);
1238
		matched_dst->force = rs->force;
1239
	}
1240
	return 0;
1241 1242 1243 1244 1245 1246 1247 1248
}

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++)
1249 1250
		errs += match_explicit(src, dst, dst_tail, &rs[i]);
	return errs;
1251 1252
}

1253
static char *get_ref_match(const struct refspec *rs, int rs_nr, const struct ref *ref,
F
Felipe Contreras 已提交
1254
		int send_mirror, int direction, const struct refspec **ret_pat)
1255
{
1256 1257
	const struct refspec *pat;
	char *name;
1258
	int i;
1259
	int matching_refs = -1;
1260
	for (i = 0; i < rs_nr; i++) {
1261 1262 1263 1264 1265 1266
		if (rs[i].matching &&
		    (matching_refs == -1 || rs[i].force)) {
			matching_refs = i;
			continue;
		}

1267 1268
		if (rs[i].pattern) {
			const char *dst_side = rs[i].dst ? rs[i].dst : rs[i].src;
F
Felipe Contreras 已提交
1269 1270 1271 1272 1273 1274
			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) {
1275 1276 1277 1278
				matching_refs = i;
				break;
			}
		}
1279
	}
1280
	if (matching_refs == -1)
1281
		return NULL;
1282 1283 1284 1285 1286 1287 1288 1289

	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.
		 */
1290
		if (!send_mirror && !starts_with(ref->name, "refs/heads/"))
1291 1292 1293 1294 1295 1296
			return NULL;
		name = xstrdup(ref->name);
	}
	if (ret_pat)
		*ret_pat = pat;
	return name;
1297 1298
}

1299 1300 1301 1302 1303 1304 1305 1306
static struct ref **tail_ref(struct ref **head)
{
	struct ref **tail = head;
	while (*tail)
		tail = &((*tail)->next);
	return tail;
}

J
Junio C Hamano 已提交
1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344
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);
1345
		if (starts_with(ref->name, "refs/tags/"))
J
Junio C Hamano 已提交
1346 1347 1348 1349
			string_list_append(&dst_tag, ref->name);
	}
	clear_commit_marks_many(sent_tips.nr, sent_tips.tip, TMP_MARK);

1350
	string_list_sort(&dst_tag);
J
Junio C Hamano 已提交
1351 1352 1353

	/* Collect tags they do not have. */
	for (ref = src; ref; ref = ref->next) {
1354
		if (!starts_with(ref->name, "refs/tags/"))
J
Junio C Hamano 已提交
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 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401
			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);
}

1402 1403 1404 1405 1406 1407 1408 1409
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;
}

1410 1411 1412 1413 1414
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;

1415
	string_list_sort(ref_index);
1416 1417
}

1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442
/*
 * 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;
}

1443
/*
1444 1445 1446 1447 1448 1449
 * 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).
1450
 */
1451 1452
int match_push_refs(struct ref *src, struct ref **dst,
		    int nr_refspec, const char **refspec, int flags)
1453
{
1454
	struct refspec *rs;
A
Andy Whitcroft 已提交
1455 1456
	int send_all = flags & MATCH_REFS_ALL;
	int send_mirror = flags & MATCH_REFS_MIRROR;
F
Felipe Contreras 已提交
1457
	int send_prune = flags & MATCH_REFS_PRUNE;
1458
	int errs;
1459
	static const char *default_refspec[] = { ":", NULL };
1460
	struct ref *ref, **dst_tail = tail_ref(dst);
1461
	struct string_list dst_ref_index = STRING_LIST_INIT_NODUP;
1462

1463 1464 1465 1466 1467
	if (!nr_refspec) {
		nr_refspec = 1;
		refspec = default_refspec;
	}
	rs = parse_push_refspec(nr_refspec, (const char **) refspec);
1468
	errs = match_explicit_refs(src, *dst, &dst_tail, rs, nr_refspec);
1469 1470

	/* pick the remainder */
1471
	for (ref = src; ref; ref = ref->next) {
1472
		struct string_list_item *dst_item;
1473
		struct ref *dst_peer;
1474 1475
		const struct refspec *pat = NULL;
		char *dst_name;
1476

F
Felipe Contreras 已提交
1477
		dst_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_SRC, &pat);
1478
		if (!dst_name)
1479 1480
			continue;

1481 1482 1483 1484 1485
		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;
1486 1487 1488 1489 1490 1491 1492 1493 1494
		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 已提交
1495
				 * --all or --mirror.
1496 1497
				 */
				goto free_name;
A
Andy Whitcroft 已提交
1498

1499
			/* Create a new one and link it */
1500
			dst_peer = make_linked_ref(dst_name, &dst_tail);
1501
			hashcpy(dst_peer->new_sha1, ref->new_sha1);
1502 1503
			string_list_insert(&dst_ref_index,
				dst_peer->name)->util = dst_peer;
1504
		}
1505
		dst_peer->peer_ref = copy_ref(ref);
1506
		dst_peer->force = pat->force;
1507 1508
	free_name:
		free(dst_name);
1509
	}
J
Junio C Hamano 已提交
1510

1511 1512
	string_list_clear(&dst_ref_index, 0);

J
Junio C Hamano 已提交
1513 1514 1515
	if (flags & MATCH_REFS_FOLLOW_TAGS)
		add_missing_tags(src, dst, &dst_tail);

F
Felipe Contreras 已提交
1516
	if (send_prune) {
1517
		struct string_list src_ref_index = STRING_LIST_INIT_NODUP;
F
Felipe Contreras 已提交
1518 1519 1520 1521 1522 1523 1524 1525 1526 1527
		/* 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) {
1528 1529 1530 1531
				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 已提交
1532 1533 1534 1535
					ref->peer_ref = alloc_delete_ref();
				free(src_name);
			}
		}
1536
		string_list_clear(&src_ref_index, 0);
F
Felipe Contreras 已提交
1537
	}
1538 1539
	if (errs)
		return -1;
1540 1541
	return 0;
}
1542

1543
void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
1544
			     int force_update)
1545 1546 1547 1548
{
	struct ref *ref;

	for (ref = remote_refs; ref; ref = ref->next) {
1549
		int force_ref_update = ref->force || force_update;
1550
		int reject_reason = 0;
1551

1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563
		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 已提交
1564
		/*
1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584
		 * 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.
		 *
1585 1586 1587
		 * Decide whether an individual refspec A:B can be
		 * pushed.  The push will succeed if any of the
		 * following are true:
1588
		 *
C
Chris Rorvick 已提交
1589
		 * (1) the remote reference B does not exist
1590
		 *
C
Chris Rorvick 已提交
1591 1592
		 * (2) the remote reference B is being removed (i.e.,
		 *     pushing :B where no source is specified)
1593
		 *
1594 1595 1596
		 * (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.
1597
		 *
C
Chris Rorvick 已提交
1598 1599
		 * (4) it is forced using the +A:B notation, or by
		 *     passing the --force argument
1600 1601
		 */

1602
		else if (!ref->deletion && !is_null_sha1(ref->old_sha1)) {
1603
			if (starts_with(ref->name, "refs/tags/"))
1604
				reject_reason = REF_STATUS_REJECT_ALREADY_EXISTS;
1605
			else if (!has_sha1_file(ref->old_sha1))
1606
				reject_reason = REF_STATUS_REJECT_FETCH_FIRST;
1607 1608
			else if (!lookup_commit_reference_gently(ref->old_sha1, 1) ||
				 !lookup_commit_reference_gently(ref->new_sha1, 1))
1609
				reject_reason = REF_STATUS_REJECT_NEEDS_FORCE;
1610
			else if (!ref_newer(ref->new_sha1, ref->old_sha1))
1611
				reject_reason = REF_STATUS_REJECT_NONFASTFORWARD;
1612
		}
1613 1614 1615 1616 1617 1618 1619 1620 1621

		/*
		 * "--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;
1622 1623 1624
	}
}

1625 1626
static void set_merge(struct branch *ret)
{
1627
	struct remote *remote;
1628 1629 1630 1631
	char *ref;
	unsigned char sha1[20];
	int i;

1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644
	if (!ret)
		return; /* no branch */
	if (ret->merge)
		return; /* already run */
	if (!ret->remote_name || !ret->merge_nr) {
		/*
		 * no merge config; let's make sure we don't confuse callers
		 * with a non-zero merge_nr but a NULL merge
		 */
		ret->merge_nr = 0;
		return;
	}

1645 1646
	remote = remote_get(ret->remote_name);

1647 1648 1649 1650
	ret->merge = xcalloc(ret->merge_nr, sizeof(*ret->merge));
	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]);
1651
		if (!remote_find_tracking(remote, ret->merge[i]) ||
1652 1653 1654 1655 1656 1657 1658 1659 1660 1661
		    strcmp(ret->remote_name, "."))
			continue;
		if (dwim_ref(ret->merge_name[i], strlen(ret->merge_name[i]),
			     sha1, &ref) == 1)
			ret->merge[i]->dst = ref;
		else
			ret->merge[i]->dst = xstrdup(ret->merge_name[i]);
	}
}

1662 1663 1664 1665 1666 1667 1668 1669 1670
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);
1671
	set_merge(ret);
1672 1673 1674 1675 1676 1677 1678 1679
	return ret;
}

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

1680 1681 1682
int branch_merge_matches(struct branch *branch,
		                 int i,
		                 const char *refname)
1683
{
1684
	if (!branch || i < 0 || i >= branch->merge_nr)
1685
		return 0;
1686
	return refname_match(branch->merge[i]->src, refname);
1687
}
1688

1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704
__attribute((format (printf,2,3)))
static const char *error_buf(struct strbuf *err, const char *fmt, ...)
{
	if (err) {
		va_list ap;
		va_start(ap, fmt);
		strbuf_vaddf(err, fmt, ap);
		va_end(ap);
	}
	return NULL;
}

const char *branch_get_upstream(struct branch *branch, struct strbuf *err)
{
	if (!branch)
		return error_buf(err, _("HEAD does not point to a branch"));
1705 1706 1707 1708 1709 1710 1711

	if (!branch->merge || !branch->merge[0]) {
		/*
		 * no merge config; is it because the user didn't define any,
		 * or because it is not a real branch, and get_branch
		 * auto-vivified it?
		 */
1712 1713 1714
		if (!ref_exists(branch->refname))
			return error_buf(err, _("no such branch: '%s'"),
					 branch->name);
1715 1716 1717 1718 1719 1720
		return error_buf(err,
				 _("no upstream configured for branch '%s'"),
				 branch->name);
	}

	if (!branch->merge[0]->dst)
1721 1722 1723 1724
		return error_buf(err,
				 _("upstream branch '%s' not stored as a remote-tracking branch"),
				 branch->merge[0]->src);

1725 1726 1727
	return branch->merge[0]->dst;
}

J
Jeff King 已提交
1728 1729 1730 1731 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 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812
static const char *tracking_for_push_dest(struct remote *remote,
					  const char *refname,
					  struct strbuf *err)
{
	char *ret;

	ret = apply_refspecs(remote->fetch, remote->fetch_refspec_nr, refname);
	if (!ret)
		return error_buf(err,
				 _("push destination '%s' on remote '%s' has no local tracking branch"),
				 refname, remote->name);
	return ret;
}

static const char *branch_get_push_1(struct branch *branch, struct strbuf *err)
{
	struct remote *remote;

	if (!branch)
		return error_buf(err, _("HEAD does not point to a branch"));

	remote = remote_get(pushremote_for_branch(branch, NULL));
	if (!remote)
		return error_buf(err,
				 _("branch '%s' has no remote for pushing"),
				 branch->name);

	if (remote->push_refspec_nr) {
		char *dst;
		const char *ret;

		dst = apply_refspecs(remote->push, remote->push_refspec_nr,
				     branch->refname);
		if (!dst)
			return error_buf(err,
					 _("push refspecs for '%s' do not include '%s'"),
					 remote->name, branch->name);

		ret = tracking_for_push_dest(remote, dst, err);
		free(dst);
		return ret;
	}

	if (remote->mirror)
		return tracking_for_push_dest(remote, branch->refname, err);

	switch (push_default) {
	case PUSH_DEFAULT_NOTHING:
		return error_buf(err, _("push has no destination (push.default is 'nothing')"));

	case PUSH_DEFAULT_MATCHING:
	case PUSH_DEFAULT_CURRENT:
		return tracking_for_push_dest(remote, branch->refname, err);

	case PUSH_DEFAULT_UPSTREAM:
		return branch_get_upstream(branch, err);

	case PUSH_DEFAULT_UNSPECIFIED:
	case PUSH_DEFAULT_SIMPLE:
		{
			const char *up, *cur;

			up = branch_get_upstream(branch, err);
			if (!up)
				return NULL;
			cur = tracking_for_push_dest(remote, branch->refname, err);
			if (!cur)
				return NULL;
			if (strcmp(cur, up))
				return error_buf(err,
						 _("cannot resolve 'simple' push to a single destination"));
			return cur;
		}
	}

	die("BUG: unhandled push situation");
}

const char *branch_get_push(struct branch *branch, struct strbuf *err)
{
	if (!branch->push_tracking_ref)
		branch->push_tracking_ref = branch_get_push_1(branch, err);
	return branch->push_tracking_ref;
}

1813 1814 1815 1816 1817
static int ignore_symref_update(const char *refname)
{
	unsigned char sha1[20];
	int flag;

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

1823 1824 1825 1826 1827 1828 1829
/*
 * 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.
 */
1830
static struct ref *get_expanded_map(const struct ref *remote_refs,
1831 1832
				    const struct refspec *refspec)
{
1833
	const struct ref *ref;
1834 1835 1836 1837
	struct ref *ret = NULL;
	struct ref **tail = &ret;

	for (ref = remote_refs; ref; ref = ref->next) {
1838 1839
		char *expn_name = NULL;

1840 1841
		if (strchr(ref->name, '^'))
			continue; /* a dereference item */
1842
		if (match_name_with_pattern(refspec->src, ref->name,
1843 1844
					    refspec->dst, &expn_name) &&
		    !ignore_symref_update(expn_name)) {
1845 1846
			struct ref *cpy = copy_ref(ref);

1847
			cpy->peer_ref = alloc_ref(expn_name);
1848 1849 1850 1851 1852
			if (refspec->force)
				cpy->peer_ref->force = 1;
			*tail = cpy;
			tail = &cpy->next;
		}
1853
		free(expn_name);
1854 1855 1856 1857 1858
	}

	return ret;
}

1859
static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
1860
{
1861
	const struct ref *ref;
1862
	for (ref = refs; ref; ref = ref->next) {
1863
		if (refname_match(name, ref->name))
1864 1865 1866 1867 1868
			return ref;
	}
	return NULL;
}

1869
struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
1870
{
1871
	const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
1872 1873

	if (!ref)
1874
		return NULL;
1875 1876 1877 1878 1879 1880

	return copy_ref(ref);
}

static struct ref *get_local_ref(const char *name)
{
1881
	if (!name || name[0] == '\0')
1882 1883
		return NULL;

1884
	if (starts_with(name, "refs/"))
1885
		return alloc_ref(name);
1886

1887 1888 1889
	if (starts_with(name, "heads/") ||
	    starts_with(name, "tags/") ||
	    starts_with(name, "remotes/"))
R
René Scharfe 已提交
1890
		return alloc_ref_with_prefix("refs/", 5, name);
1891

R
René Scharfe 已提交
1892
	return alloc_ref_with_prefix("refs/heads/", 11, name);
1893 1894
}

1895
int get_fetch_map(const struct ref *remote_refs,
1896
		  const struct refspec *refspec,
1897 1898
		  struct ref ***tail,
		  int missing_ok)
1899
{
D
Daniel Barkalow 已提交
1900
	struct ref *ref_map, **rmp;
1901 1902 1903 1904

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

1907 1908 1909 1910 1911 1912
		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);
		}
1913 1914 1915 1916 1917 1918 1919
		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;
		}
1920 1921
	}

D
Daniel Barkalow 已提交
1922 1923
	for (rmp = &ref_map; *rmp; ) {
		if ((*rmp)->peer_ref) {
1924
			if (!starts_with((*rmp)->peer_ref->name, "refs/") ||
1925
			    check_refname_format((*rmp)->peer_ref->name, 0)) {
D
Daniel Barkalow 已提交
1926 1927 1928 1929 1930 1931 1932 1933 1934 1935
				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);
1936 1937
	}

1938 1939
	if (ref_map)
		tail_link_ref(ref_map, tail);
1940 1941 1942

	return 0;
}
1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954

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

1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972
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;

1973 1974
	/*
	 * Both new and old must be commit-ish and new is descendant of
1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004
	 * 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;
}

2005
/*
2006
 * Compare a branch with its upstream, and save their differences (number
2007 2008 2009
 * of commits) in *num_ours and *num_theirs. The name of the upstream branch
 * (or NULL if no upstream is defined) is returned via *upstream_name, if it
 * is not itself NULL.
2010
 *
2011 2012
 * Returns -1 if num_ours and num_theirs could not be filled in (e.g., no
 * upstream defined, or ref does not exist), 0 otherwise.
2013
 */
2014 2015
int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs,
		       const char **upstream_name)
2016 2017 2018 2019 2020 2021 2022 2023
{
	unsigned char sha1[20];
	struct commit *ours, *theirs;
	char symmetric[84];
	struct rev_info revs;
	const char *rev_argv[10], *base;
	int rev_argc;

2024
	/* Cannot stat unless we are marked to build on top of somebody else. */
2025
	base = branch_get_upstream(branch, NULL);
2026 2027
	if (upstream_name)
		*upstream_name = base;
2028
	if (!base)
2029
		return -1;
2030

2031
	/* Cannot stat if what we used to build on no longer exists */
2032
	if (read_ref(base, sha1))
2033
		return -1;
2034
	theirs = lookup_commit_reference(sha1);
2035
	if (!theirs)
2036
		return -1;
2037

2038
	if (read_ref(branch->refname, sha1))
2039
		return -1;
2040
	ours = lookup_commit_reference(sha1);
2041
	if (!ours)
2042
		return -1;
2043 2044

	/* are we the same? */
2045 2046
	if (theirs == ours) {
		*num_theirs = *num_ours = 0;
2047
		return 0;
2048
	}
2049

2050
	/* Run "rev-list --left-right ours...theirs" internally... */
2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063
	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);
2064 2065
	if (prepare_revision_walk(&revs))
		die("revision walk setup failed");
2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078

	/* ... 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)++;
	}
2079 2080 2081 2082

	/* clear object flags smudged by the above traversal */
	clear_commit_marks(ours, ALL_REV_FLAGS);
	clear_commit_marks(theirs, ALL_REV_FLAGS);
2083
	return 0;
2084 2085 2086 2087 2088 2089 2090
}

/*
 * Return true when there is anything to report, otherwise false.
 */
int format_tracking_info(struct branch *branch, struct strbuf *sb)
{
2091
	int ours, theirs;
2092
	const char *full_base;
2093
	char *base;
2094
	int upstream_is_gone = 0;
2095

2096 2097 2098
	if (stat_tracking_info(branch, &ours, &theirs, &full_base) < 0) {
		if (!full_base)
			return 0;
2099 2100
		upstream_is_gone = 1;
	}
2101

2102
	base = shorten_unambiguous_ref(full_base, 0);
2103 2104 2105 2106 2107 2108 2109
	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"));
2110 2111 2112 2113
	} else if (!ours && !theirs) {
		strbuf_addf(sb,
			_("Your branch is up-to-date with '%s'.\n"),
			base);
2114
	} else if (!theirs) {
2115 2116 2117
		strbuf_addf(sb,
			Q_("Your branch is ahead of '%s' by %d commit.\n",
			   "Your branch is ahead of '%s' by %d commits.\n",
2118 2119
			   ours),
			base, ours);
2120 2121 2122
		if (advice_status_hints)
			strbuf_addf(sb,
				_("  (use \"git push\" to publish your local commits)\n"));
2123
	} else if (!ours) {
2124 2125 2126 2127 2128
		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",
2129 2130
			   theirs),
			base, theirs);
2131 2132 2133
		if (advice_status_hints)
			strbuf_addf(sb,
				_("  (use \"git pull\" to update your local branch)\n"));
2134
	} else {
2135 2136 2137 2138 2139 2140 2141
		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",
2142 2143
			   theirs),
			base, ours, theirs);
2144 2145 2146
		if (advice_status_hints)
			strbuf_addf(sb,
				_("  (use \"git pull\" to merge the remote branch into yours)\n"));
2147
	}
2148
	free(base);
2149 2150
	return 1;
}
2151

2152 2153
static int one_local_ref(const char *refname, const struct object_id *oid,
			 int flag, void *cb_data)
2154 2155 2156 2157 2158 2159
{
	struct ref ***local_tail = cb_data;
	struct ref *ref;
	int len;

	/* we already know it starts with refs/ to get here */
2160
	if (check_refname_format(refname + 5, 0))
2161 2162 2163 2164
		return 0;

	len = strlen(refname) + 1;
	ref = xcalloc(1, sizeof(*ref) + len);
2165
	hashcpy(ref->new_sha1, oid->hash);
2166 2167 2168 2169 2170 2171 2172 2173
	memcpy(ref->name, refname, len);
	**local_tail = ref;
	*local_tail = &ref->next;
	return 0;
}

struct ref *get_local_heads(void)
{
2174
	struct ref *local_refs = NULL, **local_tail = &local_refs;
2175

2176 2177 2178
	for_each_ref(one_local_ref, &local_tail);
	return local_refs;
}
J
Jay Soffian 已提交
2179

2180 2181 2182
struct ref *guess_remote_head(const struct ref *head,
			      const struct ref *refs,
			      int all)
J
Jay Soffian 已提交
2183 2184
{
	const struct ref *r;
2185 2186
	struct ref *list = NULL;
	struct ref **tail = &list;
J
Jay Soffian 已提交
2187

2188
	if (!head)
J
Jay Soffian 已提交
2189 2190
		return NULL;

2191 2192 2193 2194 2195 2196 2197 2198
	/*
	 * 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 已提交
2199
	/* If refs/heads/master could be right, it is. */
2200 2201 2202 2203 2204
	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 已提交
2205 2206

	/* Look for another ref that points there */
2207
	for (r = refs; r; r = r->next) {
2208
		if (r != head &&
2209
		    starts_with(r->name, "refs/heads/") &&
2210
		    !hashcmp(r->old_sha1, head->old_sha1)) {
2211 2212 2213 2214 2215 2216
			*tail = copy_ref(r);
			tail = &((*tail)->next);
			if (!all)
				break;
		}
	}
J
Jay Soffian 已提交
2217

2218
	return list;
J
Jay Soffian 已提交
2219
}
2220 2221 2222 2223

struct stale_heads_info {
	struct string_list *ref_names;
	struct ref **stale_refs_tail;
2224 2225
	struct refspec *refs;
	int ref_count;
2226 2227
};

2228 2229
static int get_stale_heads_cb(const char *refname, const struct object_id *oid,
			      int flags, void *cb_data)
2230 2231
{
	struct stale_heads_info *info = cb_data;
2232
	struct string_list matches = STRING_LIST_INIT_DUP;
2233
	struct refspec query;
2234
	int i, stale = 1;
2235 2236 2237
	memset(&query, 0, sizeof(struct refspec));
	query.dst = (char *)refname;

2238 2239 2240
	query_refspecs_multiple(info->refs, info->ref_count, &query, &matches);
	if (matches.nr == 0)
		goto clean_exit; /* No matches */
2241 2242 2243 2244

	/*
	 * 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
2245 2246 2247
	 * remote, we consider it to be stale. In order to deal with
	 * overlapping refspecs, we need to go over all of the
	 * matching refs.
2248
	 */
2249 2250 2251 2252 2253 2254 2255 2256
	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) {
2257
		struct ref *ref = make_linked_ref(refname, &info->stale_refs_tail);
2258
		hashcpy(ref->new_sha1, oid->hash);
2259
	}
2260

2261 2262
clean_exit:
	string_list_clear(&matches, 0);
2263 2264 2265
	return 0;
}

2266
struct ref *get_stale_heads(struct refspec *refs, int ref_count, struct ref *fetch_map)
2267 2268
{
	struct ref *ref, *stale_refs = NULL;
2269
	struct string_list ref_names = STRING_LIST_INIT_NODUP;
2270
	struct stale_heads_info info;
2271

2272 2273
	info.ref_names = &ref_names;
	info.stale_refs_tail = &stale_refs;
2274 2275
	info.refs = refs;
	info.ref_count = ref_count;
2276
	for (ref = fetch_map; ref; ref = ref->next)
2277
		string_list_append(&ref_names, ref->name);
2278
	string_list_sort(&ref_names);
2279 2280 2281 2282
	for_each_ref(get_stale_heads_cb, &info);
	string_list_clear(&ref_names, 0);
	return stale_refs;
}
2283 2284 2285 2286

/*
 * Compare-and-swap
 */
2287
static void clear_cas_option(struct push_cas_option *cas)
2288 2289 2290 2291 2292 2293 2294 2295 2296 2297 2298 2299 2300 2301 2302 2303 2304 2305 2306 2307 2308 2309 2310 2311 2312 2313 2314 2315 2316 2317 2318 2319 2320 2321 2322 2323 2324 2325 2326 2327 2328 2329 2330 2331 2332 2333 2334 2335 2336 2337 2338 2339
{
	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);
}
2340 2341 2342 2343 2344 2345 2346 2347 2348 2349 2350 2351 2352 2353 2354 2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373

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];
2374
		if (!refname_match(entry->refname, ref->name))
2375 2376 2377 2378 2379 2380 2381 2382 2383 2384 2385 2386 2387 2388 2389 2390 2391 2392 2393 2394 2395 2396 2397 2398 2399 2400
			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);
}