remote.c 59.2 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
	struct strbuf branch = STRBUF_INIT;
297
	int n = 1000;
298 299 300 301 302 303 304 305 306 307 308 309 310 311
	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;
312
	remote->origin = REMOTE_BRANCHES;
313 314 315 316 317 318
	p = s + strlen(s);
	while (isspace(p[-1]))
		*--p = 0;
	len = p - s;
	p = xmalloc(len + 1);
	strcpy(p, s);
319 320

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

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

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

391
	if (!starts_with(key,  "remote."))
392 393
		return 0;
	name = key + 7;
394 395 396 397 398 399

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

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

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

487 488
static void read_config(void)
{
489
	static int loaded;
490 491 492
	unsigned char sha1[20];
	const char *head_ref;
	int flag;
493 494

	if (loaded)
495
		return;
496 497
	loaded = 1;

498
	current_branch = NULL;
499
	head_ref = resolve_ref_unsafe("HEAD", 0, sha1, &flag);
500
	if (head_ref && (flag & REF_ISSYMREF) &&
501 502
	    skip_prefix(head_ref, "refs/heads/", &head_ref)) {
		current_branch = make_branch(head_ref, 0);
503
	}
504
	git_config(handle_config, NULL);
505
	alias_all_urls();
506 507
}

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

	if (!refspec)
		return;

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

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

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

B
Benjamin Kramer 已提交
539
		is_glob = 0;
540 541 542

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

		rhs = strrchr(lhs, ':');
548 549 550

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

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

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

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

		if (fetch) {
578 579
			unsigned char unused[40];

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

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

647 648 649 650
int valid_fetch_refspec(const char *fetch_refspec_str)
{
	struct refspec *refspec;

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

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

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

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

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

683 684 685 686 687 688 689 690 691 692 693 694
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";
}

695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711
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 *))
712 713
{
	struct remote *ret;
714
	int name_given = 0;
715

716 717
	read_config();

718 719
	if (name)
		name_given = 1;
720 721
	else
		name = get_default(current_branch, &name_given);
722

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

739 740
struct remote *remote_get(const char *name)
{
741
	return remote_get_1(name, remote_for_branch);
742 743 744 745
}

struct remote *pushremote_get(const char *name)
{
746
	return remote_get_1(name, pushremote_for_branch);
747 748
}

749 750
int remote_is_configured(const char *name)
{
751 752
	struct remotes_hash_key lookup;
	struct hashmap_entry lookup_entry;
753 754
	read_config();

755 756 757 758 759 760
	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;
761 762
}

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

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

810
struct ref *ref_remove_duplicates(struct ref *ref_map)
811
{
812
	struct string_list refs = STRING_LIST_INIT_NODUP;
813 814
	struct ref *retval = NULL;
	struct ref **p = &retval;
815

816 817 818 819 820
	while (ref_map) {
		struct ref *ref = ref_map;

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

822 823 824
		if (!ref->peer_ref) {
			*p = ref;
			p = &ref->next;
825
		} else {
826 827 828 829 830
			struct string_list_item *item =
				string_list_insert(&refs, ref->peer_ref->name);

			if (item->util) {
				/* Entry already existed */
831
				handle_duplicate((struct ref *)item->util, ref);
832 833 834 835 836
			} else {
				*p = ref;
				p = &ref->next;
				item->util = ref;
			}
837 838
		}
	}
839

840
	string_list_clear(&refs, 0);
841
	return retval;
842 843
}

844
int remote_has_url(struct remote *remote, const char *url)
845 846
{
	int i;
847 848
	for (i = 0; i < remote->url_nr; i++) {
		if (!strcmp(remote->url[i], url))
849 850 851 852 853
			return 1;
	}
	return 0;
}

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

882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907
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);
		}
	}
}

908
int query_refspecs(struct refspec *refs, int ref_count, struct refspec *query)
909 910
{
	int i;
911
	int find_src = !query->src;
912 913
	const char *needle = find_src ? query->dst : query->src;
	char **result = find_src ? &query->src : &query->dst;
914

915 916
	if (find_src && !query->dst)
		return error("query_refspecs: need either src or dst");
917

918 919 920 921
	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;
922

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

939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957
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 已提交
958 959 960 961 962 963 964 965 966 967
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;
}

968
struct ref *alloc_ref(const char *name)
969
{
970
	return alloc_ref_with_prefix("", 0, name);
971 972
}

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

989 990 991 992 993 994 995 996 997 998 999 1000
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;
}

1001
static void free_ref(struct ref *ref)
1002 1003 1004
{
	if (!ref)
		return;
1005
	free_ref(ref->peer_ref);
1006 1007 1008 1009 1010
	free(ref->remote_status);
	free(ref->symref);
	free(ref);
}

1011 1012 1013 1014 1015
void free_refs(struct ref *ref)
{
	struct ref *next;
	while (ref) {
		next = ref->next;
1016
		free_ref(ref);
1017 1018 1019 1020
		ref = next;
	}
}

1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041
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);
}

1042 1043 1044
int count_refspec_match(const char *pattern,
			struct ref *refs,
			struct ref **matched_ref)
1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055
{
	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);

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

1098
static void tail_link_ref(struct ref *ref, struct ref ***tail)
1099 1100
{
	**tail = ref;
1101 1102
	while (ref->next)
		ref = ref->next;
1103 1104 1105
	*tail = &ref->next;
}

1106 1107 1108 1109 1110 1111 1112
static struct ref *alloc_delete_ref(void)
{
	struct ref *ref = alloc_ref("(delete)");
	hashclr(ref->new_sha1);
	return ref;
}

1113 1114
static int try_explicit_object_name(const char *name,
				    struct ref **match)
1115 1116 1117
{
	unsigned char sha1[20];

1118 1119 1120 1121 1122 1123
	if (!*name) {
		if (match)
			*match = alloc_delete_ref();
		return 0;
	}

1124
	if (get_sha1(name, sha1))
1125 1126 1127 1128 1129 1130 1131
		return -1;

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

1134
static struct ref *make_linked_ref(const char *name, struct ref ***tail)
1135
{
1136
	struct ref *ret = alloc_ref(name);
1137 1138
	tail_link_ref(ret, tail);
	return ret;
1139
}
1140

1141 1142 1143 1144 1145
static char *guess_ref(const char *name, struct ref *peer)
{
	struct strbuf buf = STRBUF_INIT;
	unsigned char sha1[20];

1146 1147
	const char *r = resolve_ref_unsafe(peer->name, RESOLVE_REF_READING,
					   sha1, NULL);
1148 1149 1150
	if (!r)
		return NULL;

1151
	if (starts_with(r, "refs/heads/"))
1152
		strbuf_addstr(&buf, "refs/heads/");
1153
	else if (starts_with(r, "refs/tags/"))
1154 1155 1156 1157 1158 1159 1160 1161
		strbuf_addstr(&buf, "refs/tags/");
	else
		return NULL;

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

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

1187 1188
static int match_explicit(struct ref *src, struct ref *dst,
			  struct ref ***dst_tail,
1189
			  struct refspec *rs)
1190
{
1191
	struct ref *matched_src, *matched_dst;
1192
	int allocated_src;
1193

1194
	const char *dst_value = rs->dst;
1195
	char *dst_guess;
1196

1197
	if (rs->pattern || rs->matching)
1198
		return 0;
1199

1200
	matched_src = matched_dst = NULL;
1201 1202
	if (match_explicit_lhs(src, rs, &matched_src, &allocated_src) < 0)
		return -1;
1203

1204
	if (!dst_value) {
1205 1206 1207
		unsigned char sha1[20];
		int flag;

1208 1209 1210
		dst_value = resolve_ref_unsafe(matched_src->name,
					       RESOLVE_REF_READING,
					       sha1, &flag);
1211 1212
		if (!dst_value ||
		    ((flag & REF_ISSYMREF) &&
1213
		     !starts_with(dst_value, "refs/heads/")))
1214 1215
			die("%s cannot be resolved to branch.",
			    matched_src->name);
1216
	}
1217

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

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++)
1263 1264
		errs += match_explicit(src, dst, dst_tail, &rs[i]);
	return errs;
1265 1266
}

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

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

	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.
		 */
1304
		if (!send_mirror && !starts_with(ref->name, "refs/heads/"))
1305 1306 1307 1308 1309 1310
			return NULL;
		name = xstrdup(ref->name);
	}
	if (ret_pat)
		*ret_pat = pat;
	return name;
1311 1312
}

1313 1314 1315 1316 1317 1318 1319 1320
static struct ref **tail_ref(struct ref **head)
{
	struct ref **tail = head;
	while (*tail)
		tail = &((*tail)->next);
	return tail;
}

J
Junio C Hamano 已提交
1321 1322 1323 1324 1325 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
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);
1359
		if (starts_with(ref->name, "refs/tags/"))
J
Junio C Hamano 已提交
1360 1361 1362 1363
			string_list_append(&dst_tag, ref->name);
	}
	clear_commit_marks_many(sent_tips.nr, sent_tips.tip, TMP_MARK);

1364
	string_list_sort(&dst_tag);
J
Junio C Hamano 已提交
1365 1366 1367

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

1416 1417 1418 1419 1420 1421 1422 1423
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;
}

1424 1425 1426 1427 1428
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;

1429
	string_list_sort(ref_index);
1430 1431
}

1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456
/*
 * 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;
}

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

1477 1478 1479 1480 1481
	if (!nr_refspec) {
		nr_refspec = 1;
		refspec = default_refspec;
	}
	rs = parse_push_refspec(nr_refspec, (const char **) refspec);
1482
	errs = match_explicit_refs(src, *dst, &dst_tail, rs, nr_refspec);
1483 1484

	/* pick the remainder */
1485
	for (ref = src; ref; ref = ref->next) {
1486
		struct string_list_item *dst_item;
1487
		struct ref *dst_peer;
1488 1489
		const struct refspec *pat = NULL;
		char *dst_name;
1490

F
Felipe Contreras 已提交
1491
		dst_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_SRC, &pat);
1492
		if (!dst_name)
1493 1494
			continue;

1495 1496 1497 1498 1499
		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;
1500 1501 1502 1503 1504 1505 1506 1507 1508
		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 已提交
1509
				 * --all or --mirror.
1510 1511
				 */
				goto free_name;
A
Andy Whitcroft 已提交
1512

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

1525 1526
	string_list_clear(&dst_ref_index, 0);

J
Junio C Hamano 已提交
1527 1528 1529
	if (flags & MATCH_REFS_FOLLOW_TAGS)
		add_missing_tags(src, dst, &dst_tail);

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

1557
void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
1558
			     int force_update)
1559 1560 1561 1562
{
	struct ref *ref;

	for (ref = remote_refs; ref; ref = ref->next) {
1563
		int force_ref_update = ref->force || force_update;
1564
		int reject_reason = 0;
1565

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

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

		/*
		 * "--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;
1636 1637 1638
	}
}

1639 1640
static void set_merge(struct branch *ret)
{
1641
	struct remote *remote;
1642 1643 1644 1645
	char *ref;
	unsigned char sha1[20];
	int i;

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

1659 1660
	remote = remote_get(ret->remote_name);

1661 1662 1663 1664
	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]);
1665
		if (!remote_find_tracking(remote, ret->merge[i]) ||
1666 1667 1668 1669 1670 1671 1672 1673 1674 1675
		    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]);
	}
}

1676 1677 1678 1679 1680 1681 1682 1683 1684
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);
1685
	set_merge(ret);
1686 1687 1688 1689 1690 1691 1692 1693
	return ret;
}

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

1694 1695 1696
int branch_merge_matches(struct branch *branch,
		                 int i,
		                 const char *refname)
1697
{
1698
	if (!branch || i < 0 || i >= branch->merge_nr)
1699
		return 0;
1700
	return refname_match(branch->merge[i]->src, refname);
1701
}
1702

1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718
__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"));
1719 1720 1721 1722 1723 1724 1725

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

	if (!branch->merge[0]->dst)
1735 1736 1737 1738
		return error_buf(err,
				 _("upstream branch '%s' not stored as a remote-tracking branch"),
				 branch->merge[0]->src);

1739 1740 1741
	return branch->merge[0]->dst;
}

J
Jeff King 已提交
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 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826
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;
}

1827 1828 1829 1830 1831
static int ignore_symref_update(const char *refname)
{
	unsigned char sha1[20];
	int flag;

1832
	if (!resolve_ref_unsafe(refname, 0, sha1, &flag))
1833 1834 1835 1836
		return 0; /* non-existing refs are OK */
	return (flag & REF_ISSYMREF);
}

1837 1838 1839 1840 1841 1842 1843
/*
 * 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.
 */
1844
static struct ref *get_expanded_map(const struct ref *remote_refs,
1845 1846
				    const struct refspec *refspec)
{
1847
	const struct ref *ref;
1848 1849 1850 1851
	struct ref *ret = NULL;
	struct ref **tail = &ret;

	for (ref = remote_refs; ref; ref = ref->next) {
1852 1853
		char *expn_name = NULL;

1854 1855
		if (strchr(ref->name, '^'))
			continue; /* a dereference item */
1856
		if (match_name_with_pattern(refspec->src, ref->name,
1857 1858
					    refspec->dst, &expn_name) &&
		    !ignore_symref_update(expn_name)) {
1859 1860
			struct ref *cpy = copy_ref(ref);

1861
			cpy->peer_ref = alloc_ref(expn_name);
1862 1863 1864 1865 1866
			if (refspec->force)
				cpy->peer_ref->force = 1;
			*tail = cpy;
			tail = &cpy->next;
		}
1867
		free(expn_name);
1868 1869 1870 1871 1872
	}

	return ret;
}

1873
static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
1874
{
1875
	const struct ref *ref;
1876
	for (ref = refs; ref; ref = ref->next) {
1877
		if (refname_match(name, ref->name))
1878 1879 1880 1881 1882
			return ref;
	}
	return NULL;
}

1883
struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
1884
{
1885
	const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
1886 1887

	if (!ref)
1888
		return NULL;
1889 1890 1891 1892 1893 1894

	return copy_ref(ref);
}

static struct ref *get_local_ref(const char *name)
{
1895
	if (!name || name[0] == '\0')
1896 1897
		return NULL;

1898
	if (starts_with(name, "refs/"))
1899
		return alloc_ref(name);
1900

1901 1902 1903
	if (starts_with(name, "heads/") ||
	    starts_with(name, "tags/") ||
	    starts_with(name, "remotes/"))
R
René Scharfe 已提交
1904
		return alloc_ref_with_prefix("refs/", 5, name);
1905

R
René Scharfe 已提交
1906
	return alloc_ref_with_prefix("refs/heads/", 11, name);
1907 1908
}

1909
int get_fetch_map(const struct ref *remote_refs,
1910
		  const struct refspec *refspec,
1911 1912
		  struct ref ***tail,
		  int missing_ok)
1913
{
D
Daniel Barkalow 已提交
1914
	struct ref *ref_map, **rmp;
1915 1916 1917 1918

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

1921 1922 1923 1924 1925 1926
		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);
		}
1927 1928 1929 1930 1931 1932 1933
		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;
		}
1934 1935
	}

D
Daniel Barkalow 已提交
1936 1937
	for (rmp = &ref_map; *rmp; ) {
		if ((*rmp)->peer_ref) {
1938
			if (!starts_with((*rmp)->peer_ref->name, "refs/") ||
1939
			    check_refname_format((*rmp)->peer_ref->name, 0)) {
D
Daniel Barkalow 已提交
1940 1941 1942 1943 1944 1945 1946 1947 1948 1949
				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);
1950 1951
	}

1952 1953
	if (ref_map)
		tail_link_ref(ref_map, tail);
1954 1955 1956

	return 0;
}
1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968

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

1970 1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986
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;

1987 1988
	/*
	 * Both new and old must be commit-ish and new is descendant of
1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 2018
	 * 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;
}

2019
/*
2020
 * Compare a branch with its upstream, and save their differences (number
2021 2022 2023
 * 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.
2024
 *
2025 2026
 * 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.
2027
 */
2028 2029
int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs,
		       const char **upstream_name)
2030 2031 2032 2033 2034 2035 2036 2037
{
	unsigned char sha1[20];
	struct commit *ours, *theirs;
	char symmetric[84];
	struct rev_info revs;
	const char *rev_argv[10], *base;
	int rev_argc;

2038
	/* Cannot stat unless we are marked to build on top of somebody else. */
2039
	base = branch_get_upstream(branch, NULL);
2040 2041
	if (upstream_name)
		*upstream_name = base;
2042
	if (!base)
2043
		return -1;
2044

2045
	/* Cannot stat if what we used to build on no longer exists */
2046
	if (read_ref(base, sha1))
2047
		return -1;
2048
	theirs = lookup_commit_reference(sha1);
2049
	if (!theirs)
2050
		return -1;
2051

2052
	if (read_ref(branch->refname, sha1))
2053
		return -1;
2054
	ours = lookup_commit_reference(sha1);
2055
	if (!ours)
2056
		return -1;
2057 2058

	/* are we the same? */
2059 2060
	if (theirs == ours) {
		*num_theirs = *num_ours = 0;
2061
		return 0;
2062
	}
2063

2064
	/* Run "rev-list --left-right ours...theirs" internally... */
2065 2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077
	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);
2078 2079
	if (prepare_revision_walk(&revs))
		die("revision walk setup failed");
2080 2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092

	/* ... 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)++;
	}
2093 2094 2095 2096

	/* clear object flags smudged by the above traversal */
	clear_commit_marks(ours, ALL_REV_FLAGS);
	clear_commit_marks(theirs, ALL_REV_FLAGS);
2097
	return 0;
2098 2099 2100 2101 2102 2103 2104
}

/*
 * Return true when there is anything to report, otherwise false.
 */
int format_tracking_info(struct branch *branch, struct strbuf *sb)
{
2105
	int ours, theirs;
2106
	const char *full_base;
2107
	char *base;
2108
	int upstream_is_gone = 0;
2109

2110 2111 2112
	if (stat_tracking_info(branch, &ours, &theirs, &full_base) < 0) {
		if (!full_base)
			return 0;
2113 2114
		upstream_is_gone = 1;
	}
2115

2116
	base = shorten_unambiguous_ref(full_base, 0);
2117 2118 2119 2120 2121 2122 2123
	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"));
2124 2125 2126 2127
	} else if (!ours && !theirs) {
		strbuf_addf(sb,
			_("Your branch is up-to-date with '%s'.\n"),
			base);
2128
	} else if (!theirs) {
2129 2130 2131
		strbuf_addf(sb,
			Q_("Your branch is ahead of '%s' by %d commit.\n",
			   "Your branch is ahead of '%s' by %d commits.\n",
2132 2133
			   ours),
			base, ours);
2134 2135 2136
		if (advice_status_hints)
			strbuf_addf(sb,
				_("  (use \"git push\" to publish your local commits)\n"));
2137
	} else if (!ours) {
2138 2139 2140 2141 2142
		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",
2143 2144
			   theirs),
			base, theirs);
2145 2146 2147
		if (advice_status_hints)
			strbuf_addf(sb,
				_("  (use \"git pull\" to update your local branch)\n"));
2148
	} else {
2149 2150 2151 2152 2153 2154 2155
		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",
2156 2157
			   theirs),
			base, ours, theirs);
2158 2159 2160
		if (advice_status_hints)
			strbuf_addf(sb,
				_("  (use \"git pull\" to merge the remote branch into yours)\n"));
2161
	}
2162
	free(base);
2163 2164
	return 1;
}
2165

2166 2167
static int one_local_ref(const char *refname, const struct object_id *oid,
			 int flag, void *cb_data)
2168 2169 2170 2171 2172 2173
{
	struct ref ***local_tail = cb_data;
	struct ref *ref;
	int len;

	/* we already know it starts with refs/ to get here */
2174
	if (check_refname_format(refname + 5, 0))
2175 2176 2177 2178
		return 0;

	len = strlen(refname) + 1;
	ref = xcalloc(1, sizeof(*ref) + len);
2179
	hashcpy(ref->new_sha1, oid->hash);
2180 2181 2182 2183 2184 2185 2186 2187
	memcpy(ref->name, refname, len);
	**local_tail = ref;
	*local_tail = &ref->next;
	return 0;
}

struct ref *get_local_heads(void)
{
2188
	struct ref *local_refs = NULL, **local_tail = &local_refs;
2189

2190 2191 2192
	for_each_ref(one_local_ref, &local_tail);
	return local_refs;
}
J
Jay Soffian 已提交
2193

2194 2195 2196
struct ref *guess_remote_head(const struct ref *head,
			      const struct ref *refs,
			      int all)
J
Jay Soffian 已提交
2197 2198
{
	const struct ref *r;
2199 2200
	struct ref *list = NULL;
	struct ref **tail = &list;
J
Jay Soffian 已提交
2201

2202
	if (!head)
J
Jay Soffian 已提交
2203 2204
		return NULL;

2205 2206 2207 2208 2209 2210 2211 2212
	/*
	 * 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 已提交
2213
	/* If refs/heads/master could be right, it is. */
2214 2215 2216 2217 2218
	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 已提交
2219 2220

	/* Look for another ref that points there */
2221
	for (r = refs; r; r = r->next) {
2222
		if (r != head &&
2223
		    starts_with(r->name, "refs/heads/") &&
2224
		    !hashcmp(r->old_sha1, head->old_sha1)) {
2225 2226 2227 2228 2229 2230
			*tail = copy_ref(r);
			tail = &((*tail)->next);
			if (!all)
				break;
		}
	}
J
Jay Soffian 已提交
2231

2232
	return list;
J
Jay Soffian 已提交
2233
}
2234 2235 2236 2237

struct stale_heads_info {
	struct string_list *ref_names;
	struct ref **stale_refs_tail;
2238 2239
	struct refspec *refs;
	int ref_count;
2240 2241
};

2242 2243
static int get_stale_heads_cb(const char *refname, const struct object_id *oid,
			      int flags, void *cb_data)
2244 2245
{
	struct stale_heads_info *info = cb_data;
2246
	struct string_list matches = STRING_LIST_INIT_DUP;
2247
	struct refspec query;
2248
	int i, stale = 1;
2249 2250 2251
	memset(&query, 0, sizeof(struct refspec));
	query.dst = (char *)refname;

2252 2253 2254
	query_refspecs_multiple(info->refs, info->ref_count, &query, &matches);
	if (matches.nr == 0)
		goto clean_exit; /* No matches */
2255 2256 2257 2258

	/*
	 * 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
2259 2260 2261
	 * remote, we consider it to be stale. In order to deal with
	 * overlapping refspecs, we need to go over all of the
	 * matching refs.
2262
	 */
2263 2264 2265 2266 2267 2268 2269 2270
	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) {
2271
		struct ref *ref = make_linked_ref(refname, &info->stale_refs_tail);
2272
		hashcpy(ref->new_sha1, oid->hash);
2273
	}
2274

2275 2276
clean_exit:
	string_list_clear(&matches, 0);
2277 2278 2279
	return 0;
}

2280
struct ref *get_stale_heads(struct refspec *refs, int ref_count, struct ref *fetch_map)
2281 2282
{
	struct ref *ref, *stale_refs = NULL;
2283
	struct string_list ref_names = STRING_LIST_INIT_NODUP;
2284
	struct stale_heads_info info;
2285

2286 2287
	info.ref_names = &ref_names;
	info.stale_refs_tail = &stale_refs;
2288 2289
	info.refs = refs;
	info.ref_count = ref_count;
2290
	for (ref = fetch_map; ref; ref = ref->next)
2291
		string_list_append(&ref_names, ref->name);
2292
	string_list_sort(&ref_names);
2293 2294 2295 2296
	for_each_ref(get_stale_heads_cb, &info);
	string_list_clear(&ref_names, 0);
	return stale_refs;
}
2297 2298 2299 2300

/*
 * Compare-and-swap
 */
2301
static void clear_cas_option(struct push_cas_option *cas)
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 2340 2341 2342 2343 2344 2345 2346 2347 2348 2349 2350 2351 2352 2353
{
	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);
}
2354 2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376 2377 2378 2379 2380 2381 2382 2383 2384 2385 2386 2387

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];
2388
		if (!refname_match(entry->refname, ref->name))
2389 2390 2391 2392 2393 2394 2395 2396 2397 2398 2399 2400 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 2412 2413 2414
			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);
}