remote.c 57.1 KB
Newer Older
1 2 3
#include "cache.h"
#include "remote.h"
#include "refs.h"
4 5 6
#include "commit.h"
#include "diff.h"
#include "revision.h"
7
#include "dir.h"
8
#include "tag.h"
9
#include "string-list.h"
10
#include "mergesort.h"
11

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

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

const struct refspec *tag_refspec = &s_tag_refspec;

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

42
static struct remote **remotes;
D
Daniel Barkalow 已提交
43 44
static int remotes_alloc;
static int remotes_nr;
45
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 73
	char *ret;
	struct counted_string *longest;
	int longest_i;

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

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

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

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

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

118 119 120 121 122 123
static void add_pushurl(struct remote *remote, const char *pushurl)
{
	ALLOC_GROW(remote->pushurl, remote->pushurl_nr + 1, remote->pushurl_alloc);
	remote->pushurl[remote->pushurl_nr++] = pushurl;
}

124 125 126 127 128 129 130 131 132 133 134 135 136
static void add_pushurl_alias(struct remote *remote, const char *url)
{
	const char *pushurl = alias_url(url, &rewrites_push);
	if (pushurl != url)
		add_pushurl(remote, pushurl);
}

static void add_url_alias(struct remote *remote, const char *url)
{
	add_url(remote, alias_url(url, &rewrites));
	add_pushurl_alias(remote, url);
}

137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155
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);
}

156 157
static struct remote *make_remote(const char *name, int len)
{
158 159 160
	struct remote *ret, *replaced;
	struct remotes_hash_key lookup;
	struct hashmap_entry lookup_entry;
161

162 163 164 165 166 167 168 169 170 171
	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;
172

D
Daniel Barkalow 已提交
173
	ret = xcalloc(1, sizeof(struct remote));
174
	ret->prune = -1;  /* unspecified */
D
Daniel Barkalow 已提交
175 176
	ALLOC_GROW(remotes, remotes_nr + 1, remotes_alloc);
	remotes[remotes_nr++] = ret;
177 178 179 180 181
	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 已提交
182
	return ret;
183 184
}

185 186
static void add_merge(struct branch *branch, const char *name)
{
D
Daniel Barkalow 已提交
187 188 189
	ALLOC_GROW(branch->merge_name, branch->merge_nr + 1,
		   branch->merge_alloc);
	branch->merge_name[branch->merge_nr++] = name;
190 191 192 193
}

static struct branch *make_branch(const char *name, int len)
{
D
Daniel Barkalow 已提交
194 195
	struct branch *ret;
	int i;
196

D
Daniel Barkalow 已提交
197 198 199 200 201
	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];
202 203
	}

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

D
Daniel Barkalow 已提交
213
	return ret;
214 215
}

216
static struct rewrite *make_rewrite(struct rewrites *r, const char *base, int len)
217 218 219 220
{
	struct rewrite *ret;
	int i;

221
	for (i = 0; i < r->rewrite_nr; i++) {
222
		if (len
223 224 225 226
		    ? (len == r->rewrite[i]->baselen &&
		       !strncmp(base, r->rewrite[i]->base, len))
		    : !strcmp(base, r->rewrite[i]->base))
			return r->rewrite[i];
227 228
	}

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

251 252 253 254 255 256
static void read_remotes_file(struct remote *remote)
{
	FILE *f = fopen(git_path("remotes/%s", remote->name), "r");

	if (!f)
		return;
257
	remote->origin = REMOTE_REMOTES;
258 259 260 261
	while (fgets(buffer, BUF_SIZE, f)) {
		int value_list;
		char *s, *p;

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

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

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

		switch (value_list) {
		case 0:
285
			add_url_alias(remote, xstrdup(s));
286 287 288 289
			break;
		case 1:
			add_push_refspec(remote, xstrdup(s));
			break;
290 291 292
		case 2:
			add_fetch_refspec(remote, xstrdup(s));
			break;
293 294 295 296 297 298 299
		}
	}
	fclose(f);
}

static void read_branches_file(struct remote *remote)
{
300
	char *frag;
301
	struct strbuf branch = STRBUF_INIT;
302
	int n = 1000;
303 304 305 306 307 308 309 310 311 312 313 314 315 316
	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;
317
	remote->origin = REMOTE_BRANCHES;
318 319 320 321 322 323
	p = s + strlen(s);
	while (isspace(p[-1]))
		*--p = 0;
	len = p - s;
	p = xmalloc(len + 1);
	strcpy(p, s);
324 325

	/*
326
	 * The branches file would have URL and optionally
327 328 329
	 * #branch specified.  The "master" (or specified) branch is
	 * fetched and stored in the local branch of the same name.
	 */
330 331 332
	frag = strchr(p, '#');
	if (frag) {
		*(frag++) = '\0';
333 334 335
		strbuf_addf(&branch, "refs/heads/%s", frag);
	} else
		strbuf_addstr(&branch, "refs/heads/master");
336 337

	strbuf_addf(&branch, ":refs/heads/%s", remote->name);
338
	add_url_alias(remote, p);
339
	add_fetch_refspec(remote, strbuf_detach(&branch, NULL));
340 341 342 343 344 345 346 347 348 349
	/*
	 * 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");
350
	add_push_refspec(remote, strbuf_detach(&branch, NULL));
351
	remote->fetch_tags = 1; /* always auto-follow */
352 353
}

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

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

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

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

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

492 493
static void read_config(void)
{
494
	static int loaded;
495 496 497
	unsigned char sha1[20];
	const char *head_ref;
	int flag;
498 499

	if (loaded)
500
		return;
501 502
	loaded = 1;

503
	current_branch = NULL;
504
	head_ref = resolve_ref_unsafe("HEAD", 0, sha1, &flag);
505
	if (head_ref && (flag & REF_ISSYMREF) &&
506 507
	    skip_prefix(head_ref, "refs/heads/", &head_ref)) {
		current_branch = make_branch(head_ref, 0);
508
	}
509
	git_config(handle_config, NULL);
510
	alias_all_urls();
511 512
}

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

	if (!refspec)
		return;

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

533
static struct refspec *parse_refspec_internal(int nr_refspec, const char **refspec, int fetch, int verify)
534 535
{
	int i;
536
	struct refspec *rs = xcalloc(nr_refspec, sizeof(*rs));
537

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

B
Benjamin Kramer 已提交
544
		is_glob = 0;
545 546 547

		lhs = refspec[i];
		if (*lhs == '+') {
548
			rs[i].force = 1;
549
			lhs++;
550
		}
551 552

		rhs = strrchr(lhs, ':');
553 554 555

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

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

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

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

		if (fetch) {
583 584
			unsigned char unused[40];

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

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

652 653 654 655
int valid_fetch_refspec(const char *fetch_refspec_str)
{
	struct refspec *refspec;

656
	refspec = parse_refspec_internal(1, &fetch_refspec_str, 1, 1);
657
	free_refspecs(refspec, 1);
658 659 660
	return !!refspec;
}

661 662
struct refspec *parse_fetch_refspec(int nr_refspec, const char **refspec)
{
663
	return parse_refspec_internal(nr_refspec, refspec, 1, 0);
664 665
}

666
static struct refspec *parse_push_refspec(int nr_refspec, const char **refspec)
667
{
668
	return parse_refspec_internal(nr_refspec, refspec, 0, 0);
669 670
}

671 672 673 674 675 676 677 678 679 680
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);
}

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

688 689 690 691 692 693 694 695 696 697 698 699
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";
}

700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716
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 *))
717 718
{
	struct remote *ret;
719
	int name_given = 0;
720

721 722
	read_config();

723 724
	if (name)
		name_given = 1;
725 726
	else
		name = get_default(current_branch, &name_given);
727

728
	ret = make_remote(name, 0);
729
	if (valid_remote_nick(name)) {
730
		if (!valid_remote(ret))
731
			read_remotes_file(ret);
732
		if (!valid_remote(ret))
733 734
			read_branches_file(ret);
	}
735
	if (name_given && !valid_remote(ret))
736
		add_url_alias(ret, name);
737
	if (!valid_remote(ret))
738
		return NULL;
739 740
	ret->fetch = parse_fetch_refspec(ret->fetch_refspec_nr, ret->fetch_refspec);
	ret->push = parse_push_refspec(ret->push_refspec_nr, ret->push_refspec);
741 742
	return ret;
}
743

744 745
struct remote *remote_get(const char *name)
{
746
	return remote_get_1(name, remote_for_branch);
747 748 749 750
}

struct remote *pushremote_get(const char *name)
{
751
	return remote_get_1(name, pushremote_for_branch);
752 753
}

754 755
int remote_is_configured(const char *name)
{
756 757
	struct remotes_hash_key lookup;
	struct hashmap_entry lookup_entry;
758 759
	read_config();

760 761 762 763 764 765
	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;
766 767
}

768 769 770 771
int for_each_remote(each_remote_fn fn, void *priv)
{
	int i, result = 0;
	read_config();
D
Daniel Barkalow 已提交
772
	for (i = 0; i < remotes_nr && !result; i++) {
773 774 775 776
		struct remote *r = remotes[i];
		if (!r)
			continue;
		if (!r->fetch)
777 778
			r->fetch = parse_fetch_refspec(r->fetch_refspec_nr,
						       r->fetch_refspec);
779
		if (!r->push)
780 781
			r->push = parse_push_refspec(r->push_refspec_nr,
						     r->push_refspec);
782 783 784 785 786
		result = fn(r, priv);
	}
	return result;
}

787 788
static void handle_duplicate(struct ref *ref1, struct ref *ref2)
{
789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810
	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"));
		}
	}
811 812 813 814
	free(ref2->peer_ref);
	free(ref2);
}

815
struct ref *ref_remove_duplicates(struct ref *ref_map)
816
{
817
	struct string_list refs = STRING_LIST_INIT_NODUP;
818 819
	struct ref *retval = NULL;
	struct ref **p = &retval;
820

821 822 823 824 825
	while (ref_map) {
		struct ref *ref = ref_map;

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

827 828 829
		if (!ref->peer_ref) {
			*p = ref;
			p = &ref->next;
830
		} else {
831 832 833 834 835
			struct string_list_item *item =
				string_list_insert(&refs, ref->peer_ref->name);

			if (item->util) {
				/* Entry already existed */
836
				handle_duplicate((struct ref *)item->util, ref);
837 838 839 840 841
			} else {
				*p = ref;
				p = &ref->next;
				item->util = ref;
			}
842 843
		}
	}
844

845
	string_list_clear(&refs, 0);
846
	return retval;
847 848
}

849
int remote_has_url(struct remote *remote, const char *url)
850 851
{
	int i;
852 853
	for (i = 0; i < remote->url_nr; i++) {
		if (!strcmp(remote->url[i], url))
854 855 856 857 858
			return 1;
	}
	return 0;
}

859 860
static int match_name_with_pattern(const char *key, const char *name,
				   const char *value, char **result)
861
{
D
Daniel Barkalow 已提交
862 863
	const char *kstar = strchr(key, '*');
	size_t klen;
864 865
	size_t ksuffixlen;
	size_t namelen;
D
Daniel Barkalow 已提交
866 867 868 869
	int ret;
	if (!kstar)
		die("Key '%s' of pattern had no '*'", key);
	klen = kstar - key;
870 871 872 873
	ksuffixlen = strlen(kstar + 1);
	namelen = strlen(name);
	ret = !strncmp(name, key, klen) && namelen >= klen + ksuffixlen &&
		!memcmp(name + namelen - ksuffixlen, kstar + 1, ksuffixlen);
874
	if (ret && value) {
875
		struct strbuf sb = STRBUF_INIT;
D
Daniel Barkalow 已提交
876 877 878
		const char *vstar = strchr(value, '*');
		if (!vstar)
			die("Value '%s' of pattern has no '*'", value);
879 880 881 882
		strbuf_add(&sb, value, vstar - value);
		strbuf_add(&sb, name + klen, namelen - klen - ksuffixlen);
		strbuf_addstr(&sb, vstar + 1);
		*result = strbuf_detach(&sb, NULL);
883
	}
884 885 886
	return ret;
}

887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912
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);
		}
	}
}

913
int query_refspecs(struct refspec *refs, int ref_count, struct refspec *query)
914 915
{
	int i;
916
	int find_src = !query->src;
917 918
	const char *needle = find_src ? query->dst : query->src;
	char **result = find_src ? &query->src : &query->dst;
919

920 921
	if (find_src && !query->dst)
		return error("query_refspecs: need either src or dst");
922

923 924 925 926
	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;
927

928
		if (!refspec->dst)
929
			continue;
930
		if (refspec->pattern) {
931
			if (match_name_with_pattern(key, needle, value, result)) {
932
				query->force = refspec->force;
933 934
				return 0;
			}
935 936
		} else if (!strcmp(needle, key)) {
			*result = xstrdup(value);
937
			query->force = refspec->force;
938
			return 0;
939 940 941 942 943
		}
	}
	return -1;
}

944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962
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 已提交
963 964 965 966 967 968 969 970 971 972
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;
}

973
struct ref *alloc_ref(const char *name)
974
{
975
	return alloc_ref_with_prefix("", 0, name);
976 977
}

J
Jeff King 已提交
978
struct ref *copy_ref(const struct ref *ref)
979
{
980 981 982 983 984 985 986 987
	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;
988 989
	cpy->symref = xstrdup_or_null(ref->symref);
	cpy->remote_status = xstrdup_or_null(ref->remote_status);
990 991
	cpy->peer_ref = copy_ref(ref->peer_ref);
	return cpy;
992 993
}

994 995 996 997 998 999 1000 1001 1002 1003 1004 1005
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;
}

1006
static void free_ref(struct ref *ref)
1007 1008 1009
{
	if (!ref)
		return;
1010
	free_ref(ref->peer_ref);
1011 1012 1013 1014 1015
	free(ref->remote_status);
	free(ref->symref);
	free(ref);
}

1016 1017 1018 1019 1020
void free_refs(struct ref *ref)
{
	struct ref *next;
	while (ref) {
		next = ref->next;
1021
		free_ref(ref);
1022 1023 1024 1025
		ref = next;
	}
}

1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046
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);
}

1047 1048 1049
int count_refspec_match(const char *pattern,
			struct ref *refs,
			struct ref **matched_ref)
1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060
{
	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);

1061
		if (!refname_match(pattern, name))
1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073
			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 &&
1074 1075
		    !starts_with(name, "refs/heads/") &&
		    !starts_with(name, "refs/tags/")) {
1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091
			/* 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) {
1092 1093
		if (matched_ref)
			*matched_ref = matched_weak;
1094 1095 1096
		return weak_match;
	}
	else {
1097 1098
		if (matched_ref)
			*matched_ref = matched;
1099 1100 1101 1102
		return match;
	}
}

1103
static void tail_link_ref(struct ref *ref, struct ref ***tail)
1104 1105
{
	**tail = ref;
1106 1107
	while (ref->next)
		ref = ref->next;
1108 1109 1110
	*tail = &ref->next;
}

1111 1112 1113 1114 1115 1116 1117
static struct ref *alloc_delete_ref(void)
{
	struct ref *ref = alloc_ref("(delete)");
	hashclr(ref->new_sha1);
	return ref;
}

1118 1119
static int try_explicit_object_name(const char *name,
				    struct ref **match)
1120 1121 1122
{
	unsigned char sha1[20];

1123 1124 1125 1126 1127 1128
	if (!*name) {
		if (match)
			*match = alloc_delete_ref();
		return 0;
	}

1129
	if (get_sha1(name, sha1))
1130 1131 1132 1133 1134 1135 1136
		return -1;

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

1139
static struct ref *make_linked_ref(const char *name, struct ref ***tail)
1140
{
1141
	struct ref *ret = alloc_ref(name);
1142 1143
	tail_link_ref(ret, tail);
	return ret;
1144
}
1145

1146 1147 1148 1149 1150
static char *guess_ref(const char *name, struct ref *peer)
{
	struct strbuf buf = STRBUF_INIT;
	unsigned char sha1[20];

1151 1152
	const char *r = resolve_ref_unsafe(peer->name, RESOLVE_REF_READING,
					   sha1, NULL);
1153 1154 1155
	if (!r)
		return NULL;

1156
	if (starts_with(r, "refs/heads/"))
1157
		strbuf_addstr(&buf, "refs/heads/");
1158
	else if (starts_with(r, "refs/tags/"))
1159 1160 1161 1162 1163 1164 1165 1166
		strbuf_addstr(&buf, "refs/tags/");
	else
		return NULL;

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

1167 1168 1169 1170 1171 1172 1173
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:
1174 1175
		if (allocated_match)
			*allocated_match = 0;
1176 1177 1178 1179 1180 1181
		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.
		 */
1182
		if (try_explicit_object_name(rs->src, match) < 0)
1183
			return error("src refspec %s does not match any.", rs->src);
1184 1185
		if (allocated_match)
			*allocated_match = 1;
1186 1187 1188 1189 1190 1191
		return 0;
	default:
		return error("src refspec %s matches more than one.", rs->src);
	}
}

1192 1193
static int match_explicit(struct ref *src, struct ref *dst,
			  struct ref ***dst_tail,
1194
			  struct refspec *rs)
1195
{
1196
	struct ref *matched_src, *matched_dst;
1197
	int allocated_src;
1198

1199
	const char *dst_value = rs->dst;
1200
	char *dst_guess;
1201

1202
	if (rs->pattern || rs->matching)
1203
		return 0;
1204

1205
	matched_src = matched_dst = NULL;
1206 1207
	if (match_explicit_lhs(src, rs, &matched_src, &allocated_src) < 0)
		return -1;
1208

1209
	if (!dst_value) {
1210 1211 1212
		unsigned char sha1[20];
		int flag;

1213 1214 1215
		dst_value = resolve_ref_unsafe(matched_src->name,
					       RESOLVE_REF_READING,
					       sha1, &flag);
1216 1217
		if (!dst_value ||
		    ((flag & REF_ISSYMREF) &&
1218
		     !starts_with(dst_value, "refs/heads/")))
1219 1220
			die("%s cannot be resolved to branch.",
			    matched_src->name);
1221
	}
1222

1223 1224 1225 1226
	switch (count_refspec_match(dst_value, dst, &matched_dst)) {
	case 1:
		break;
	case 0:
1227
		if (starts_with(dst_value, "refs/"))
1228
			matched_dst = make_linked_ref(dst_value, dst_tail);
1229 1230 1231
		else if (is_null_sha1(matched_src->new_sha1))
			error("unable to delete '%s': remote ref does not exist",
			      dst_value);
1232
		else if ((dst_guess = guess_ref(dst_value, matched_src)))
1233
			matched_dst = make_linked_ref(dst_guess, dst_tail);
1234
		else
1235 1236 1237 1238 1239 1240
			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);
1241 1242
		break;
	default:
1243
		matched_dst = NULL;
1244 1245 1246 1247
		error("dst refspec %s matches more than one.",
		      dst_value);
		break;
	}
1248 1249 1250 1251
	if (!matched_dst)
		return -1;
	if (matched_dst->peer_ref)
		return error("dst ref %s receives from more than one src.",
1252 1253
		      matched_dst->name);
	else {
1254 1255 1256
		matched_dst->peer_ref = allocated_src ?
					matched_src :
					copy_ref(matched_src);
1257
		matched_dst->force = rs->force;
1258
	}
1259
	return 0;
1260 1261 1262 1263 1264 1265 1266 1267
}

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++)
1268 1269
		errs += match_explicit(src, dst, dst_tail, &rs[i]);
	return errs;
1270 1271
}

1272
static char *get_ref_match(const struct refspec *rs, int rs_nr, const struct ref *ref,
F
Felipe Contreras 已提交
1273
		int send_mirror, int direction, const struct refspec **ret_pat)
1274
{
1275 1276
	const struct refspec *pat;
	char *name;
1277
	int i;
1278
	int matching_refs = -1;
1279
	for (i = 0; i < rs_nr; i++) {
1280 1281 1282 1283 1284 1285
		if (rs[i].matching &&
		    (matching_refs == -1 || rs[i].force)) {
			matching_refs = i;
			continue;
		}

1286 1287
		if (rs[i].pattern) {
			const char *dst_side = rs[i].dst ? rs[i].dst : rs[i].src;
F
Felipe Contreras 已提交
1288 1289 1290 1291 1292 1293
			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) {
1294 1295 1296 1297
				matching_refs = i;
				break;
			}
		}
1298
	}
1299
	if (matching_refs == -1)
1300
		return NULL;
1301 1302 1303 1304 1305 1306 1307 1308

	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.
		 */
1309
		if (!send_mirror && !starts_with(ref->name, "refs/heads/"))
1310 1311 1312 1313 1314 1315
			return NULL;
		name = xstrdup(ref->name);
	}
	if (ret_pat)
		*ret_pat = pat;
	return name;
1316 1317
}

1318 1319 1320 1321 1322 1323 1324 1325
static struct ref **tail_ref(struct ref **head)
{
	struct ref **tail = head;
	while (*tail)
		tail = &((*tail)->next);
	return tail;
}

J
Junio C Hamano 已提交
1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 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
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);
1364
		if (starts_with(ref->name, "refs/tags/"))
J
Junio C Hamano 已提交
1365 1366 1367 1368
			string_list_append(&dst_tag, ref->name);
	}
	clear_commit_marks_many(sent_tips.nr, sent_tips.tip, TMP_MARK);

1369
	string_list_sort(&dst_tag);
J
Junio C Hamano 已提交
1370 1371 1372

	/* Collect tags they do not have. */
	for (ref = src; ref; ref = ref->next) {
1373
		if (!starts_with(ref->name, "refs/tags/"))
J
Junio C Hamano 已提交
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 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420
			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);
}

1421 1422 1423 1424 1425 1426 1427 1428
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;
}

1429 1430 1431 1432 1433
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;

1434
	string_list_sort(ref_index);
1435 1436
}

1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461
/*
 * 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;
}

1462
/*
1463 1464 1465 1466 1467 1468
 * 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).
1469
 */
1470 1471
int match_push_refs(struct ref *src, struct ref **dst,
		    int nr_refspec, const char **refspec, int flags)
1472
{
1473
	struct refspec *rs;
A
Andy Whitcroft 已提交
1474 1475
	int send_all = flags & MATCH_REFS_ALL;
	int send_mirror = flags & MATCH_REFS_MIRROR;
F
Felipe Contreras 已提交
1476
	int send_prune = flags & MATCH_REFS_PRUNE;
1477
	int errs;
1478
	static const char *default_refspec[] = { ":", NULL };
1479
	struct ref *ref, **dst_tail = tail_ref(dst);
1480
	struct string_list dst_ref_index = STRING_LIST_INIT_NODUP;
1481

1482 1483 1484 1485 1486
	if (!nr_refspec) {
		nr_refspec = 1;
		refspec = default_refspec;
	}
	rs = parse_push_refspec(nr_refspec, (const char **) refspec);
1487
	errs = match_explicit_refs(src, *dst, &dst_tail, rs, nr_refspec);
1488 1489

	/* pick the remainder */
1490
	for (ref = src; ref; ref = ref->next) {
1491
		struct string_list_item *dst_item;
1492
		struct ref *dst_peer;
1493 1494
		const struct refspec *pat = NULL;
		char *dst_name;
1495

F
Felipe Contreras 已提交
1496
		dst_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_SRC, &pat);
1497
		if (!dst_name)
1498 1499
			continue;

1500 1501 1502 1503 1504
		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;
1505 1506 1507 1508 1509 1510 1511 1512 1513
		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 已提交
1514
				 * --all or --mirror.
1515 1516
				 */
				goto free_name;
A
Andy Whitcroft 已提交
1517

1518
			/* Create a new one and link it */
1519
			dst_peer = make_linked_ref(dst_name, &dst_tail);
1520
			hashcpy(dst_peer->new_sha1, ref->new_sha1);
1521 1522
			string_list_insert(&dst_ref_index,
				dst_peer->name)->util = dst_peer;
1523
		}
1524
		dst_peer->peer_ref = copy_ref(ref);
1525
		dst_peer->force = pat->force;
1526 1527
	free_name:
		free(dst_name);
1528
	}
J
Junio C Hamano 已提交
1529

1530 1531
	string_list_clear(&dst_ref_index, 0);

J
Junio C Hamano 已提交
1532 1533 1534
	if (flags & MATCH_REFS_FOLLOW_TAGS)
		add_missing_tags(src, dst, &dst_tail);

F
Felipe Contreras 已提交
1535
	if (send_prune) {
1536
		struct string_list src_ref_index = STRING_LIST_INIT_NODUP;
F
Felipe Contreras 已提交
1537 1538 1539 1540 1541 1542 1543 1544 1545 1546
		/* 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) {
1547 1548 1549 1550
				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 已提交
1551 1552 1553 1554
					ref->peer_ref = alloc_delete_ref();
				free(src_name);
			}
		}
1555
		string_list_clear(&src_ref_index, 0);
F
Felipe Contreras 已提交
1556
	}
1557 1558
	if (errs)
		return -1;
1559 1560
	return 0;
}
1561

1562
void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
1563
			     int force_update)
1564 1565 1566 1567
{
	struct ref *ref;

	for (ref = remote_refs; ref; ref = ref->next) {
1568
		int force_ref_update = ref->force || force_update;
1569
		int reject_reason = 0;
1570

1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582
		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 已提交
1583
		/*
1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603
		 * 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.
		 *
1604 1605 1606
		 * Decide whether an individual refspec A:B can be
		 * pushed.  The push will succeed if any of the
		 * following are true:
1607
		 *
C
Chris Rorvick 已提交
1608
		 * (1) the remote reference B does not exist
1609
		 *
C
Chris Rorvick 已提交
1610 1611
		 * (2) the remote reference B is being removed (i.e.,
		 *     pushing :B where no source is specified)
1612
		 *
1613 1614 1615
		 * (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.
1616
		 *
C
Chris Rorvick 已提交
1617 1618
		 * (4) it is forced using the +A:B notation, or by
		 *     passing the --force argument
1619 1620
		 */

1621
		else if (!ref->deletion && !is_null_sha1(ref->old_sha1)) {
1622
			if (starts_with(ref->name, "refs/tags/"))
1623
				reject_reason = REF_STATUS_REJECT_ALREADY_EXISTS;
1624
			else if (!has_sha1_file(ref->old_sha1))
1625
				reject_reason = REF_STATUS_REJECT_FETCH_FIRST;
1626 1627
			else if (!lookup_commit_reference_gently(ref->old_sha1, 1) ||
				 !lookup_commit_reference_gently(ref->new_sha1, 1))
1628
				reject_reason = REF_STATUS_REJECT_NEEDS_FORCE;
1629
			else if (!ref_newer(ref->new_sha1, ref->old_sha1))
1630
				reject_reason = REF_STATUS_REJECT_NONFASTFORWARD;
1631
		}
1632 1633 1634 1635 1636 1637 1638 1639 1640

		/*
		 * "--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;
1641 1642 1643
	}
}

1644 1645
static void set_merge(struct branch *ret)
{
1646
	struct remote *remote;
1647 1648 1649 1650
	char *ref;
	unsigned char sha1[20];
	int i;

1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663
	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;
	}

1664 1665
	remote = remote_get(ret->remote_name);

1666 1667 1668 1669
	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]);
1670
		if (!remote_find_tracking(remote, ret->merge[i]) ||
1671 1672 1673 1674 1675 1676 1677 1678 1679 1680
		    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]);
	}
}

1681 1682 1683 1684 1685 1686 1687 1688 1689
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);
1690
	set_merge(ret);
1691 1692 1693 1694 1695 1696 1697 1698
	return ret;
}

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

1699 1700 1701
int branch_merge_matches(struct branch *branch,
		                 int i,
		                 const char *refname)
1702
{
1703
	if (!branch || i < 0 || i >= branch->merge_nr)
1704
		return 0;
1705
	return refname_match(branch->merge[i]->src, refname);
1706
}
1707

1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723
__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"));
1724 1725 1726 1727 1728 1729 1730

	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?
		 */
1731 1732 1733
		if (!ref_exists(branch->refname))
			return error_buf(err, _("no such branch: '%s'"),
					 branch->name);
1734 1735 1736 1737 1738 1739
		return error_buf(err,
				 _("no upstream configured for branch '%s'"),
				 branch->name);
	}

	if (!branch->merge[0]->dst)
1740 1741 1742 1743
		return error_buf(err,
				 _("upstream branch '%s' not stored as a remote-tracking branch"),
				 branch->merge[0]->src);

1744 1745 1746
	return branch->merge[0]->dst;
}

1747 1748 1749 1750 1751
static int ignore_symref_update(const char *refname)
{
	unsigned char sha1[20];
	int flag;

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

1757 1758 1759 1760 1761 1762 1763
/*
 * 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.
 */
1764
static struct ref *get_expanded_map(const struct ref *remote_refs,
1765 1766
				    const struct refspec *refspec)
{
1767
	const struct ref *ref;
1768 1769 1770 1771
	struct ref *ret = NULL;
	struct ref **tail = &ret;

	for (ref = remote_refs; ref; ref = ref->next) {
1772 1773
		char *expn_name = NULL;

1774 1775
		if (strchr(ref->name, '^'))
			continue; /* a dereference item */
1776
		if (match_name_with_pattern(refspec->src, ref->name,
1777 1778
					    refspec->dst, &expn_name) &&
		    !ignore_symref_update(expn_name)) {
1779 1780
			struct ref *cpy = copy_ref(ref);

1781
			cpy->peer_ref = alloc_ref(expn_name);
1782 1783 1784 1785 1786
			if (refspec->force)
				cpy->peer_ref->force = 1;
			*tail = cpy;
			tail = &cpy->next;
		}
1787
		free(expn_name);
1788 1789 1790 1791 1792
	}

	return ret;
}

1793
static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
1794
{
1795
	const struct ref *ref;
1796
	for (ref = refs; ref; ref = ref->next) {
1797
		if (refname_match(name, ref->name))
1798 1799 1800 1801 1802
			return ref;
	}
	return NULL;
}

1803
struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
1804
{
1805
	const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
1806 1807

	if (!ref)
1808
		return NULL;
1809 1810 1811 1812 1813 1814

	return copy_ref(ref);
}

static struct ref *get_local_ref(const char *name)
{
1815
	if (!name || name[0] == '\0')
1816 1817
		return NULL;

1818
	if (starts_with(name, "refs/"))
1819
		return alloc_ref(name);
1820

1821 1822 1823
	if (starts_with(name, "heads/") ||
	    starts_with(name, "tags/") ||
	    starts_with(name, "remotes/"))
R
René Scharfe 已提交
1824
		return alloc_ref_with_prefix("refs/", 5, name);
1825

R
René Scharfe 已提交
1826
	return alloc_ref_with_prefix("refs/heads/", 11, name);
1827 1828
}

1829
int get_fetch_map(const struct ref *remote_refs,
1830
		  const struct refspec *refspec,
1831 1832
		  struct ref ***tail,
		  int missing_ok)
1833
{
D
Daniel Barkalow 已提交
1834
	struct ref *ref_map, **rmp;
1835 1836 1837 1838

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

1841 1842 1843 1844 1845 1846
		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);
		}
1847 1848 1849 1850 1851 1852 1853
		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;
		}
1854 1855
	}

D
Daniel Barkalow 已提交
1856 1857
	for (rmp = &ref_map; *rmp; ) {
		if ((*rmp)->peer_ref) {
1858
			if (!starts_with((*rmp)->peer_ref->name, "refs/") ||
1859
			    check_refname_format((*rmp)->peer_ref->name, 0)) {
D
Daniel Barkalow 已提交
1860 1861 1862 1863 1864 1865 1866 1867 1868 1869
				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);
1870 1871
	}

1872 1873
	if (ref_map)
		tail_link_ref(ref_map, tail);
1874 1875 1876

	return 0;
}
1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888

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

1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906
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;

1907 1908
	/*
	 * Both new and old must be commit-ish and new is descendant of
1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938
	 * 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;
}

1939
/*
1940 1941 1942 1943 1944
 * 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).
1945 1946 1947 1948 1949 1950 1951 1952 1953 1954
 */
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;

1955
	/* Cannot stat unless we are marked to build on top of somebody else. */
1956
	base = branch_get_upstream(branch, NULL);
1957
	if (!base)
1958 1959
		return 0;

1960
	/* Cannot stat if what we used to build on no longer exists */
1961
	if (read_ref(base, sha1))
1962
		return -1;
1963
	theirs = lookup_commit_reference(sha1);
1964
	if (!theirs)
1965
		return -1;
1966

1967
	if (read_ref(branch->refname, sha1))
1968
		return -1;
1969
	ours = lookup_commit_reference(sha1);
1970
	if (!ours)
1971
		return -1;
1972 1973

	/* are we the same? */
1974 1975 1976 1977
	if (theirs == ours) {
		*num_theirs = *num_ours = 0;
		return 1;
	}
1978

1979
	/* Run "rev-list --left-right ours...theirs" internally... */
1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992
	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);
1993 1994
	if (prepare_revision_walk(&revs))
		die("revision walk setup failed");
1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007

	/* ... 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)++;
	}
2008 2009 2010 2011

	/* clear object flags smudged by the above traversal */
	clear_commit_marks(ours, ALL_REV_FLAGS);
	clear_commit_marks(theirs, ALL_REV_FLAGS);
2012 2013 2014 2015 2016 2017 2018 2019
	return 1;
}

/*
 * Return true when there is anything to report, otherwise false.
 */
int format_tracking_info(struct branch *branch, struct strbuf *sb)
{
2020
	int ours, theirs;
2021
	char *base;
2022
	int upstream_is_gone = 0;
2023

2024 2025 2026
	switch (stat_tracking_info(branch, &ours, &theirs)) {
	case 0:
		/* no base */
2027
		return 0;
2028 2029 2030 2031 2032 2033 2034 2035
	case -1:
		/* with "gone" base */
		upstream_is_gone = 1;
		break;
	default:
		/* with base */
		break;
	}
2036

2037
	base = shorten_unambiguous_ref(branch->merge[0]->dst, 0);
2038 2039 2040 2041 2042 2043 2044
	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"));
2045 2046 2047 2048
	} else if (!ours && !theirs) {
		strbuf_addf(sb,
			_("Your branch is up-to-date with '%s'.\n"),
			base);
2049
	} else if (!theirs) {
2050 2051 2052
		strbuf_addf(sb,
			Q_("Your branch is ahead of '%s' by %d commit.\n",
			   "Your branch is ahead of '%s' by %d commits.\n",
2053 2054
			   ours),
			base, ours);
2055 2056 2057
		if (advice_status_hints)
			strbuf_addf(sb,
				_("  (use \"git push\" to publish your local commits)\n"));
2058
	} else if (!ours) {
2059 2060 2061 2062 2063
		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",
2064 2065
			   theirs),
			base, theirs);
2066 2067 2068
		if (advice_status_hints)
			strbuf_addf(sb,
				_("  (use \"git pull\" to update your local branch)\n"));
2069
	} else {
2070 2071 2072 2073 2074 2075 2076
		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",
2077 2078
			   theirs),
			base, ours, theirs);
2079 2080 2081
		if (advice_status_hints)
			strbuf_addf(sb,
				_("  (use \"git pull\" to merge the remote branch into yours)\n"));
2082
	}
2083
	free(base);
2084 2085
	return 1;
}
2086 2087 2088 2089 2090 2091 2092 2093

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 */
2094
	if (check_refname_format(refname + 5, 0))
2095 2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107
		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)
{
2108
	struct ref *local_refs = NULL, **local_tail = &local_refs;
2109 2110 2111
	for_each_ref(one_local_ref, &local_tail);
	return local_refs;
}
J
Jay Soffian 已提交
2112

2113 2114 2115
struct ref *guess_remote_head(const struct ref *head,
			      const struct ref *refs,
			      int all)
J
Jay Soffian 已提交
2116 2117
{
	const struct ref *r;
2118 2119
	struct ref *list = NULL;
	struct ref **tail = &list;
J
Jay Soffian 已提交
2120

2121
	if (!head)
J
Jay Soffian 已提交
2122 2123
		return NULL;

2124 2125 2126 2127 2128 2129 2130 2131
	/*
	 * 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 已提交
2132
	/* If refs/heads/master could be right, it is. */
2133 2134 2135 2136 2137
	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 已提交
2138 2139

	/* Look for another ref that points there */
2140
	for (r = refs; r; r = r->next) {
2141
		if (r != head &&
2142
		    starts_with(r->name, "refs/heads/") &&
2143
		    !hashcmp(r->old_sha1, head->old_sha1)) {
2144 2145 2146 2147 2148 2149
			*tail = copy_ref(r);
			tail = &((*tail)->next);
			if (!all)
				break;
		}
	}
J
Jay Soffian 已提交
2150

2151
	return list;
J
Jay Soffian 已提交
2152
}
2153 2154 2155 2156

struct stale_heads_info {
	struct string_list *ref_names;
	struct ref **stale_refs_tail;
2157 2158
	struct refspec *refs;
	int ref_count;
2159 2160 2161 2162 2163 2164
};

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;
2165
	struct string_list matches = STRING_LIST_INIT_DUP;
2166
	struct refspec query;
2167
	int i, stale = 1;
2168 2169 2170
	memset(&query, 0, sizeof(struct refspec));
	query.dst = (char *)refname;

2171 2172 2173
	query_refspecs_multiple(info->refs, info->ref_count, &query, &matches);
	if (matches.nr == 0)
		goto clean_exit; /* No matches */
2174 2175 2176 2177

	/*
	 * 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
2178 2179 2180
	 * remote, we consider it to be stale. In order to deal with
	 * overlapping refspecs, we need to go over all of the
	 * matching refs.
2181
	 */
2182 2183 2184 2185 2186 2187 2188 2189
	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) {
2190 2191
		struct ref *ref = make_linked_ref(refname, &info->stale_refs_tail);
		hashcpy(ref->new_sha1, sha1);
2192
	}
2193

2194 2195
clean_exit:
	string_list_clear(&matches, 0);
2196 2197 2198
	return 0;
}

2199
struct ref *get_stale_heads(struct refspec *refs, int ref_count, struct ref *fetch_map)
2200 2201
{
	struct ref *ref, *stale_refs = NULL;
2202
	struct string_list ref_names = STRING_LIST_INIT_NODUP;
2203 2204 2205
	struct stale_heads_info info;
	info.ref_names = &ref_names;
	info.stale_refs_tail = &stale_refs;
2206 2207
	info.refs = refs;
	info.ref_count = ref_count;
2208
	for (ref = fetch_map; ref; ref = ref->next)
2209
		string_list_append(&ref_names, ref->name);
2210
	string_list_sort(&ref_names);
2211 2212 2213 2214
	for_each_ref(get_stale_heads_cb, &info);
	string_list_clear(&ref_names, 0);
	return stale_refs;
}
2215 2216 2217 2218

/*
 * Compare-and-swap
 */
2219
static void clear_cas_option(struct push_cas_option *cas)
2220 2221 2222 2223 2224 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271
{
	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);
}
2272 2273 2274 2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 2295 2296 2297 2298 2299 2300 2301 2302 2303 2304 2305

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];
2306
		if (!refname_match(entry->refname, ref->name))
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
			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);
}