remote.c 58.5 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
#include "argv-array.h"
12

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

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

const struct refspec *tag_refspec = &s_tag_refspec;

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

43
static struct remote **remotes;
D
Daniel Barkalow 已提交
44 45
static int remotes_alloc;
static int remotes_nr;
46
static struct hashmap remotes_hash;
47

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

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

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

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

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

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

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

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

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

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

111 112 113 114 115 116
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;
}

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

130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148
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);
}

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

155 156 157 158 159 160 161 162 163 164
	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;
165

D
Daniel Barkalow 已提交
166
	ret = xcalloc(1, sizeof(struct remote));
167
	ret->prune = -1;  /* unspecified */
D
Daniel Barkalow 已提交
168 169
	ALLOC_GROW(remotes, remotes_nr + 1, remotes_alloc);
	remotes[remotes_nr++] = ret;
170 171 172 173 174
	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 已提交
175
	return ret;
176 177
}

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

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

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

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

D
Daniel Barkalow 已提交
206
	return ret;
207 208
}

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

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

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

244 245 246 247 248 249 250
static const char *skip_spaces(const char *s)
{
	while (isspace(*s))
		s++;
	return s;
}

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

	if (!f)
		return;
258
	remote->origin = REMOTE_REMOTES;
259
	while (strbuf_getline(&buf, f) != EOF) {
260
		const char *v;
261

262
		strbuf_rtrim(&buf);
263

264 265 266 267 268 269
		if (skip_prefix(buf.buf, "URL:", &v))
			add_url_alias(remote, xstrdup(skip_spaces(v)));
		else if (skip_prefix(buf.buf, "Push:", &v))
			add_push_refspec(remote, xstrdup(skip_spaces(v)));
		else if (skip_prefix(buf.buf, "Pull:", &v))
			add_fetch_refspec(remote, xstrdup(skip_spaces(v)));
270
	}
271
	strbuf_release(&buf);
272 273 274 275 276
	fclose(f);
}

static void read_branches_file(struct remote *remote)
{
277
	char *frag;
278 279
	struct strbuf buf = STRBUF_INIT;
	FILE *f = fopen(git_path("branches/%s", remote->name), "r");
280 281 282

	if (!f)
		return;
283

284
	strbuf_getline_lf(&buf, f);
285
	fclose(f);
286 287 288
	strbuf_trim(&buf);
	if (!buf.len) {
		strbuf_release(&buf);
289
		return;
290 291
	}

292
	remote->origin = REMOTE_BRANCHES;
293 294

	/*
295
	 * The branches file would have URL and optionally
296
	 * #branch specified.  The "master" (or specified) branch is
297 298
	 * fetched and stored in the local branch matching the
	 * remote name.
299
	 */
300 301
	frag = strchr(buf.buf, '#');
	if (frag)
302
		*(frag++) = '\0';
303 304 305 306 307 308
	else
		frag = "master";

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

310 311 312 313
	/*
	 * Cogito compatible push: push current HEAD to remote #branch
	 * (master if missing)
	 */
314
	add_push_refspec(remote, xstrfmt("HEAD:refs/heads/%s", frag));
315
	remote->fetch_tags = 1; /* always auto-follow */
316 317
}

318
static int handle_config(const char *key, const char *value, void *cb)
319 320
{
	const char *name;
T
Thomas Gummerer 已提交
321
	int namelen;
322 323
	const char *subkey;
	struct remote *remote;
324
	struct branch *branch;
T
Thomas Gummerer 已提交
325 326
	if (parse_config_key(key, "branch", &name, &namelen, &subkey) >= 0) {
		if (!name)
327
			return 0;
T
Thomas Gummerer 已提交
328 329
		branch = make_branch(name, namelen);
		if (!strcmp(subkey, "remote")) {
330
			return git_config_string(&branch->remote_name, key, value);
T
Thomas Gummerer 已提交
331
		} else if (!strcmp(subkey, "pushremote")) {
332
			return git_config_string(&branch->pushremote_name, key, value);
T
Thomas Gummerer 已提交
333
		} else if (!strcmp(subkey, "merge")) {
334 335
			if (!value)
				return config_error_nonbool(key);
336
			add_merge(branch, xstrdup(value));
337
		}
338
		return 0;
339
	}
T
Thomas Gummerer 已提交
340
	if (parse_config_key(key, "url", &name, &namelen, &subkey) >= 0) {
341
		struct rewrite *rewrite;
T
Thomas Gummerer 已提交
342
		if (!name)
343
			return 0;
T
Thomas Gummerer 已提交
344 345
		if (!strcmp(subkey, "insteadof")) {
			rewrite = make_rewrite(&rewrites, name, namelen);
346 347 348
			if (!value)
				return config_error_nonbool(key);
			add_instead_of(rewrite, xstrdup(value));
T
Thomas Gummerer 已提交
349 350
		} else if (!strcmp(subkey, "pushinsteadof")) {
			rewrite = make_rewrite(&rewrites_push, name, namelen);
351 352 353 354 355
			if (!value)
				return config_error_nonbool(key);
			add_instead_of(rewrite, xstrdup(value));
		}
	}
356

T
Thomas Gummerer 已提交
357
	if (parse_config_key(key, "remote", &name, &namelen, &subkey) < 0)
358
		return 0;
359 360

	/* Handle remote.* variables */
T
Thomas Gummerer 已提交
361
	if (!name && !strcmp(subkey, "pushdefault"))
362 363
		return git_config_string(&pushremote_name, key, value);

T
Thomas Gummerer 已提交
364 365
	if (!name)
		return 0;
366
	/* Handle remote.<name>.* variables */
367 368 369 370 371
	if (*name == '/') {
		warning("Config remote shorthand cannot begin with '/': %s",
			name);
		return 0;
	}
T
Thomas Gummerer 已提交
372
	remote = make_remote(name, namelen);
373
	remote->origin = REMOTE_CONFIG;
T
Thomas Gummerer 已提交
374
	if (!strcmp(subkey, "mirror"))
375
		remote->mirror = git_config_bool(key, value);
T
Thomas Gummerer 已提交
376
	else if (!strcmp(subkey, "skipdefaultupdate"))
377
		remote->skip_default_update = git_config_bool(key, value);
T
Thomas Gummerer 已提交
378
	else if (!strcmp(subkey, "skipfetchall"))
379
		remote->skip_default_update = git_config_bool(key, value);
T
Thomas Gummerer 已提交
380
	else if (!strcmp(subkey, "prune"))
381
		remote->prune = git_config_bool(key, value);
T
Thomas Gummerer 已提交
382
	else if (!strcmp(subkey, "url")) {
383 384 385 386
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
		add_url(remote, v);
T
Thomas Gummerer 已提交
387
	} else if (!strcmp(subkey, "pushurl")) {
388 389 390 391
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
		add_pushurl(remote, v);
T
Thomas Gummerer 已提交
392
	} else if (!strcmp(subkey, "push")) {
393 394 395 396
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
		add_push_refspec(remote, v);
T
Thomas Gummerer 已提交
397
	} else if (!strcmp(subkey, "fetch")) {
398 399 400 401
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
		add_fetch_refspec(remote, v);
T
Thomas Gummerer 已提交
402
	} else if (!strcmp(subkey, "receivepack")) {
403 404 405
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
406
		if (!remote->receivepack)
407
			remote->receivepack = v;
408 409
		else
			error("more than one receivepack given, using the first");
T
Thomas Gummerer 已提交
410
	} else if (!strcmp(subkey, "uploadpack")) {
411 412 413
		const char *v;
		if (git_config_string(&v, key, value))
			return -1;
414
		if (!remote->uploadpack)
415
			remote->uploadpack = v;
416 417
		else
			error("more than one uploadpack given, using the first");
T
Thomas Gummerer 已提交
418
	} else if (!strcmp(subkey, "tagopt")) {
419 420
		if (!strcmp(value, "--no-tags"))
			remote->fetch_tags = -1;
421 422
		else if (!strcmp(value, "--tags"))
			remote->fetch_tags = 2;
T
Thomas Gummerer 已提交
423
	} else if (!strcmp(subkey, "proxy")) {
424 425
		return git_config_string((const char **)&remote->http_proxy,
					 key, value);
T
Thomas Gummerer 已提交
426
	} else if (!strcmp(subkey, "proxyauthmethod")) {
427 428
		return git_config_string((const char **)&remote->http_proxy_authmethod,
					 key, value);
T
Thomas Gummerer 已提交
429
	} else if (!strcmp(subkey, "vcs")) {
430
		return git_config_string(&remote->foreign_vcs, key, value);
431
	}
432 433 434
	return 0;
}

435 436 437 438
static void alias_all_urls(void)
{
	int i, j;
	for (i = 0; i < remotes_nr; i++) {
439
		int add_pushurl_aliases;
440 441
		if (!remotes[i])
			continue;
442
		for (j = 0; j < remotes[i]->pushurl_nr; j++) {
443
			remotes[i]->pushurl[j] = alias_url(remotes[i]->pushurl[j], &rewrites);
444
		}
445 446 447 448 449 450
		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);
		}
451 452 453
	}
}

454 455
static void read_config(void)
{
456
	static int loaded;
457
	struct object_id oid;
458
	int flag;
459 460

	if (loaded)
461
		return;
462 463
	loaded = 1;

464
	current_branch = NULL;
465 466 467 468 469 470
	if (startup_info->have_repository) {
		const char *head_ref = resolve_ref_unsafe("HEAD", 0, oid.hash, &flag);
		if (head_ref && (flag & REF_ISSYMREF) &&
		    skip_prefix(head_ref, "refs/heads/", &head_ref)) {
			current_branch = make_branch(head_ref, 0);
		}
471
	}
472
	git_config(handle_config, NULL);
473
	alias_all_urls();
474 475
}

476 477 478 479 480 481
/*
 * 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.
 */
482
static void free_refspecs(struct refspec *refspec, int nr_refspec)
483 484 485 486 487 488 489 490 491 492 493 494 495
{
	int i;

	if (!refspec)
		return;

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

496
static struct refspec *parse_refspec_internal(int nr_refspec, const char **refspec, int fetch, int verify)
497 498
{
	int i;
499
	struct refspec *rs = xcalloc(nr_refspec, sizeof(*rs));
500

501
	for (i = 0; i < nr_refspec; i++) {
502
		size_t llen;
503 504
		int is_glob;
		const char *lhs, *rhs;
505
		int flags;
506

B
Benjamin Kramer 已提交
507
		is_glob = 0;
508 509 510

		lhs = refspec[i];
		if (*lhs == '+') {
511
			rs[i].force = 1;
512
			lhs++;
513
		}
514 515

		rhs = strrchr(lhs, ':');
516 517 518

		/*
		 * Before going on, special case ":" (or "+:") as a refspec
519
		 * for pushing matching refs.
520 521 522 523 524 525
		 */
		if (!fetch && rhs == lhs && rhs[1] == '\0') {
			rs[i].matching = 1;
			continue;
		}

526
		if (rhs) {
527
			size_t rlen = strlen(++rhs);
528
			is_glob = (1 <= rlen && strchr(rhs, '*'));
D
Daniel Barkalow 已提交
529
			rs[i].dst = xstrndup(rhs, rlen);
530
		}
D
Daniel Barkalow 已提交
531

532
		llen = (rhs ? (rhs - lhs - 1) : strlen(lhs));
533
		if (1 <= llen && memchr(lhs, '*', llen)) {
534 535 536 537 538
			if ((rhs && !is_glob) || (!rhs && fetch))
				goto invalid;
			is_glob = 1;
		} else if (rhs && is_glob) {
			goto invalid;
D
Daniel Barkalow 已提交
539
		}
540

541 542
		rs[i].pattern = is_glob;
		rs[i].src = xstrndup(lhs, llen);
543
		flags = REFNAME_ALLOW_ONELEVEL | (is_glob ? REFNAME_REFSPEC_PATTERN : 0);
544 545

		if (fetch) {
546
			struct object_id unused;
547

548
			/* LHS */
549
			if (!*rs[i].src)
550
				; /* empty is ok; it means "HEAD" */
551
			else if (llen == GIT_SHA1_HEXSZ && !get_oid_hex(rs[i].src, &unused))
552
				rs[i].exact_sha1 = 1; /* ok */
553 554 555
			else if (!check_refname_format(rs[i].src, flags))
				; /* valid looking ref is ok */
			else
556
				goto invalid;
557
			/* RHS */
558
			if (!rs[i].dst)
559
				; /* missing is ok; it is the same as empty */
560
			else if (!*rs[i].dst)
561 562 563 564
				; /* empty is ok; it means "do not store" */
			else if (!check_refname_format(rs[i].dst, flags))
				; /* valid looking ref is ok */
			else
565
				goto invalid;
566 567 568 569 570 571 572 573 574 575 576
		} 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) {
577
				if (check_refname_format(rs[i].src, flags))
578 579 580 581 582 583 584 585 586 587 588 589
					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) {
590
				if (check_refname_format(rs[i].src, flags))
591 592 593 594
					goto invalid;
			} else if (!*rs[i].dst) {
				goto invalid;
			} else {
595
				if (check_refname_format(rs[i].dst, flags))
596 597
					goto invalid;
			}
D
Daniel Barkalow 已提交
598
		}
599 600
	}
	return rs;
601 602

 invalid:
603
	if (verify) {
604 605 606 607 608 609
		/*
		 * 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);
610 611
		return NULL;
	}
612 613 614
	die("Invalid refspec '%s'", refspec[i]);
}

615 616 617 618
int valid_fetch_refspec(const char *fetch_refspec_str)
{
	struct refspec *refspec;

619
	refspec = parse_refspec_internal(1, &fetch_refspec_str, 1, 1);
620
	free_refspecs(refspec, 1);
621 622 623
	return !!refspec;
}

624 625
struct refspec *parse_fetch_refspec(int nr_refspec, const char **refspec)
{
626
	return parse_refspec_internal(nr_refspec, refspec, 1, 0);
627 628
}

629
static struct refspec *parse_push_refspec(int nr_refspec, const char **refspec)
630
{
631
	return parse_refspec_internal(nr_refspec, refspec, 0, 0);
632 633
}

634 635 636 637 638 639 640 641 642 643
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);
}

644 645
static int valid_remote_nick(const char *name)
{
646
	if (!name[0] || is_dot_or_dotdot(name))
647 648 649 650
		return 0;
	return !strchr(name, '/'); /* no slash */
}

651 652 653 654 655 656 657 658 659 660 661 662
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";
}

663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679
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 *))
680 681
{
	struct remote *ret;
682
	int name_given = 0;
683

684 685
	read_config();

686 687
	if (name)
		name_given = 1;
688 689
	else
		name = get_default(current_branch, &name_given);
690

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

707 708
struct remote *remote_get(const char *name)
{
709
	return remote_get_1(name, remote_for_branch);
710 711 712 713
}

struct remote *pushremote_get(const char *name)
{
714
	return remote_get_1(name, pushremote_for_branch);
715 716
}

717
int remote_is_configured(struct remote *remote)
718
{
719
	return remote && remote->origin;
720 721
}

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

741 742
static void handle_duplicate(struct ref *ref1, struct ref *ref2)
{
743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764
	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"));
		}
	}
765 766 767 768
	free(ref2->peer_ref);
	free(ref2);
}

769
struct ref *ref_remove_duplicates(struct ref *ref_map)
770
{
771
	struct string_list refs = STRING_LIST_INIT_NODUP;
772 773
	struct ref *retval = NULL;
	struct ref **p = &retval;
774

775 776 777 778 779
	while (ref_map) {
		struct ref *ref = ref_map;

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

781 782 783
		if (!ref->peer_ref) {
			*p = ref;
			p = &ref->next;
784
		} else {
785 786 787 788 789
			struct string_list_item *item =
				string_list_insert(&refs, ref->peer_ref->name);

			if (item->util) {
				/* Entry already existed */
790
				handle_duplicate((struct ref *)item->util, ref);
791 792 793 794 795
			} else {
				*p = ref;
				p = &ref->next;
				item->util = ref;
			}
796 797
		}
	}
798

799
	string_list_clear(&refs, 0);
800
	return retval;
801 802
}

803
int remote_has_url(struct remote *remote, const char *url)
804 805
{
	int i;
806 807
	for (i = 0; i < remote->url_nr; i++) {
		if (!strcmp(remote->url[i], url))
808 809 810 811 812
			return 1;
	}
	return 0;
}

813 814
static int match_name_with_pattern(const char *key, const char *name,
				   const char *value, char **result)
815
{
D
Daniel Barkalow 已提交
816 817
	const char *kstar = strchr(key, '*');
	size_t klen;
818 819
	size_t ksuffixlen;
	size_t namelen;
D
Daniel Barkalow 已提交
820 821 822 823
	int ret;
	if (!kstar)
		die("Key '%s' of pattern had no '*'", key);
	klen = kstar - key;
824 825 826 827
	ksuffixlen = strlen(kstar + 1);
	namelen = strlen(name);
	ret = !strncmp(name, key, klen) && namelen >= klen + ksuffixlen &&
		!memcmp(name + namelen - ksuffixlen, kstar + 1, ksuffixlen);
828
	if (ret && value) {
829
		struct strbuf sb = STRBUF_INIT;
D
Daniel Barkalow 已提交
830 831 832
		const char *vstar = strchr(value, '*');
		if (!vstar)
			die("Value '%s' of pattern has no '*'", value);
833 834 835 836
		strbuf_add(&sb, value, vstar - value);
		strbuf_add(&sb, name + klen, namelen - klen - ksuffixlen);
		strbuf_addstr(&sb, vstar + 1);
		*result = strbuf_detach(&sb, NULL);
837
	}
838 839 840
	return ret;
}

841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866
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);
		}
	}
}

867
int query_refspecs(struct refspec *refs, int ref_count, struct refspec *query)
868 869
{
	int i;
870
	int find_src = !query->src;
871 872
	const char *needle = find_src ? query->dst : query->src;
	char **result = find_src ? &query->src : &query->dst;
873

874 875
	if (find_src && !query->dst)
		return error("query_refspecs: need either src or dst");
876

877 878 879 880
	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;
881

882
		if (!refspec->dst)
883
			continue;
884
		if (refspec->pattern) {
885
			if (match_name_with_pattern(key, needle, value, result)) {
886
				query->force = refspec->force;
887 888
				return 0;
			}
889 890
		} else if (!strcmp(needle, key)) {
			*result = xstrdup(value);
891
			query->force = refspec->force;
892
			return 0;
893 894 895 896 897
		}
	}
	return -1;
}

898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916
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 已提交
917 918 919 920
static struct ref *alloc_ref_with_prefix(const char *prefix, size_t prefixlen,
		const char *name)
{
	size_t len = strlen(name);
921
	struct ref *ref = xcalloc(1, st_add4(sizeof(*ref), prefixlen, len, 1));
R
René Scharfe 已提交
922 923 924 925 926
	memcpy(ref->name, prefix, prefixlen);
	memcpy(ref->name + prefixlen, name, len);
	return ref;
}

927
struct ref *alloc_ref(const char *name)
928
{
929
	return alloc_ref_with_prefix("", 0, name);
930 931
}

J
Jeff King 已提交
932
struct ref *copy_ref(const struct ref *ref)
933
{
934 935 936 937
	struct ref *cpy;
	size_t len;
	if (!ref)
		return NULL;
938 939 940
	len = st_add3(sizeof(struct ref), strlen(ref->name), 1);
	cpy = xmalloc(len);
	memcpy(cpy, ref, len);
941
	cpy->next = NULL;
942 943
	cpy->symref = xstrdup_or_null(ref->symref);
	cpy->remote_status = xstrdup_or_null(ref->remote_status);
944 945
	cpy->peer_ref = copy_ref(ref->peer_ref);
	return cpy;
946 947
}

948 949 950 951 952 953 954 955 956 957 958 959
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;
}

960
static void free_ref(struct ref *ref)
961 962 963
{
	if (!ref)
		return;
964
	free_ref(ref->peer_ref);
965 966 967 968 969
	free(ref->remote_status);
	free(ref->symref);
	free(ref);
}

970 971 972 973 974
void free_refs(struct ref *ref)
{
	struct ref *next;
	while (ref) {
		next = ref->next;
975
		free_ref(ref);
976 977 978 979
		ref = next;
	}
}

980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000
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);
}

1001 1002 1003
int count_refspec_match(const char *pattern,
			struct ref *refs,
			struct ref **matched_ref)
1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014
{
	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);

1015
		if (!refname_match(pattern, name))
1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027
			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 &&
1028 1029
		    !starts_with(name, "refs/heads/") &&
		    !starts_with(name, "refs/tags/")) {
1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045
			/* 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) {
1046 1047
		if (matched_ref)
			*matched_ref = matched_weak;
1048 1049 1050
		return weak_match;
	}
	else {
1051 1052
		if (matched_ref)
			*matched_ref = matched;
1053 1054 1055 1056
		return match;
	}
}

1057
static void tail_link_ref(struct ref *ref, struct ref ***tail)
1058 1059
{
	**tail = ref;
1060 1061
	while (ref->next)
		ref = ref->next;
1062 1063 1064
	*tail = &ref->next;
}

1065 1066 1067
static struct ref *alloc_delete_ref(void)
{
	struct ref *ref = alloc_ref("(delete)");
1068
	oidclr(&ref->new_oid);
1069 1070 1071
	return ref;
}

1072 1073
static int try_explicit_object_name(const char *name,
				    struct ref **match)
1074
{
1075
	struct object_id oid;
1076

1077 1078 1079 1080 1081 1082
	if (!*name) {
		if (match)
			*match = alloc_delete_ref();
		return 0;
	}

1083
	if (get_sha1(name, oid.hash))
1084 1085 1086 1087
		return -1;

	if (match) {
		*match = alloc_ref(name);
1088
		oidcpy(&(*match)->new_oid, &oid);
1089 1090
	}
	return 0;
1091 1092
}

1093
static struct ref *make_linked_ref(const char *name, struct ref ***tail)
1094
{
1095
	struct ref *ret = alloc_ref(name);
1096 1097
	tail_link_ref(ret, tail);
	return ret;
1098
}
1099

1100 1101 1102
static char *guess_ref(const char *name, struct ref *peer)
{
	struct strbuf buf = STRBUF_INIT;
1103
	struct object_id oid;
1104

1105
	const char *r = resolve_ref_unsafe(peer->name, RESOLVE_REF_READING,
1106
					   oid.hash, NULL);
1107 1108 1109
	if (!r)
		return NULL;

1110
	if (starts_with(r, "refs/heads/"))
1111
		strbuf_addstr(&buf, "refs/heads/");
1112
	else if (starts_with(r, "refs/tags/"))
1113 1114 1115 1116 1117 1118 1119 1120
		strbuf_addstr(&buf, "refs/tags/");
	else
		return NULL;

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

1121 1122 1123 1124 1125 1126 1127
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:
1128 1129
		if (allocated_match)
			*allocated_match = 0;
1130 1131 1132 1133 1134 1135
		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.
		 */
1136
		if (try_explicit_object_name(rs->src, match) < 0)
1137
			return error("src refspec %s does not match any.", rs->src);
1138 1139
		if (allocated_match)
			*allocated_match = 1;
1140 1141 1142 1143 1144 1145
		return 0;
	default:
		return error("src refspec %s matches more than one.", rs->src);
	}
}

1146 1147
static int match_explicit(struct ref *src, struct ref *dst,
			  struct ref ***dst_tail,
1148
			  struct refspec *rs)
1149
{
1150
	struct ref *matched_src, *matched_dst;
1151
	int allocated_src;
1152

1153
	const char *dst_value = rs->dst;
1154
	char *dst_guess;
1155

1156
	if (rs->pattern || rs->matching)
1157
		return 0;
1158

1159
	matched_src = matched_dst = NULL;
1160 1161
	if (match_explicit_lhs(src, rs, &matched_src, &allocated_src) < 0)
		return -1;
1162

1163
	if (!dst_value) {
1164
		struct object_id oid;
1165 1166
		int flag;

1167 1168
		dst_value = resolve_ref_unsafe(matched_src->name,
					       RESOLVE_REF_READING,
1169
					       oid.hash, &flag);
1170 1171
		if (!dst_value ||
		    ((flag & REF_ISSYMREF) &&
1172
		     !starts_with(dst_value, "refs/heads/")))
1173 1174
			die("%s cannot be resolved to branch.",
			    matched_src->name);
1175
	}
1176

1177 1178 1179 1180
	switch (count_refspec_match(dst_value, dst, &matched_dst)) {
	case 1:
		break;
	case 0:
1181
		if (starts_with(dst_value, "refs/"))
1182
			matched_dst = make_linked_ref(dst_value, dst_tail);
1183
		else if (is_null_oid(&matched_src->new_oid))
1184 1185
			error("unable to delete '%s': remote ref does not exist",
			      dst_value);
1186
		else if ((dst_guess = guess_ref(dst_value, matched_src)))
1187
			matched_dst = make_linked_ref(dst_guess, dst_tail);
1188
		else
1189 1190 1191 1192 1193 1194
			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);
1195 1196
		break;
	default:
1197
		matched_dst = NULL;
1198 1199 1200 1201
		error("dst refspec %s matches more than one.",
		      dst_value);
		break;
	}
1202 1203 1204 1205
	if (!matched_dst)
		return -1;
	if (matched_dst->peer_ref)
		return error("dst ref %s receives from more than one src.",
1206 1207
		      matched_dst->name);
	else {
1208 1209 1210
		matched_dst->peer_ref = allocated_src ?
					matched_src :
					copy_ref(matched_src);
1211
		matched_dst->force = rs->force;
1212
	}
1213
	return 0;
1214 1215 1216 1217 1218 1219 1220 1221
}

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++)
1222 1223
		errs += match_explicit(src, dst, dst_tail, &rs[i]);
	return errs;
1224 1225
}

1226
static char *get_ref_match(const struct refspec *rs, int rs_nr, const struct ref *ref,
F
Felipe Contreras 已提交
1227
		int send_mirror, int direction, const struct refspec **ret_pat)
1228
{
1229 1230
	const struct refspec *pat;
	char *name;
1231
	int i;
1232
	int matching_refs = -1;
1233
	for (i = 0; i < rs_nr; i++) {
1234 1235 1236 1237 1238 1239
		if (rs[i].matching &&
		    (matching_refs == -1 || rs[i].force)) {
			matching_refs = i;
			continue;
		}

1240 1241
		if (rs[i].pattern) {
			const char *dst_side = rs[i].dst ? rs[i].dst : rs[i].src;
F
Felipe Contreras 已提交
1242 1243 1244 1245 1246 1247
			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) {
1248 1249 1250 1251
				matching_refs = i;
				break;
			}
		}
1252
	}
1253
	if (matching_refs == -1)
1254
		return NULL;
1255 1256 1257 1258 1259 1260 1261 1262

	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.
		 */
1263
		if (!send_mirror && !starts_with(ref->name, "refs/heads/"))
1264 1265 1266 1267 1268 1269
			return NULL;
		name = xstrdup(ref->name);
	}
	if (ret_pat)
		*ret_pat = pat;
	return name;
1270 1271
}

1272 1273 1274 1275 1276 1277 1278 1279
static struct ref **tail_ref(struct ref **head)
{
	struct ref **tail = head;
	while (*tail)
		tail = &((*tail)->next);
	return tail;
}

J
Junio C Hamano 已提交
1280 1281 1282 1283 1284
struct tips {
	struct commit **tip;
	int nr, alloc;
};

1285
static void add_to_tips(struct tips *tips, const struct object_id *oid)
J
Junio C Hamano 已提交
1286 1287 1288
{
	struct commit *commit;

1289
	if (is_null_oid(oid))
J
Junio C Hamano 已提交
1290
		return;
1291
	commit = lookup_commit_reference_gently(oid->hash, 1);
J
Junio C Hamano 已提交
1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313
	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 &&
1314
		    !is_null_oid(&ref->peer_ref->new_oid))
1315
			add_to_tips(&sent_tips, &ref->peer_ref->new_oid);
J
Junio C Hamano 已提交
1316
		else
1317
			add_to_tips(&sent_tips, &ref->old_oid);
1318
		if (starts_with(ref->name, "refs/tags/"))
J
Junio C Hamano 已提交
1319 1320 1321 1322
			string_list_append(&dst_tag, ref->name);
	}
	clear_commit_marks_many(sent_tips.nr, sent_tips.tip, TMP_MARK);

1323
	string_list_sort(&dst_tag);
J
Junio C Hamano 已提交
1324 1325 1326

	/* Collect tags they do not have. */
	for (ref = src; ref; ref = ref->next) {
1327
		if (!starts_with(ref->name, "refs/tags/"))
J
Junio C Hamano 已提交
1328 1329 1330
			continue; /* not a tag */
		if (string_list_has_string(&dst_tag, ref->name))
			continue; /* they already have it */
1331
		if (sha1_object_info(ref->new_oid.hash, NULL) != OBJ_TAG)
J
Junio C Hamano 已提交
1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350
			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;

1351
			if (is_null_oid(&ref->new_oid))
J
Junio C Hamano 已提交
1352
				continue;
1353
			commit = lookup_commit_reference_gently(ref->new_oid.hash, 1);
J
Junio C Hamano 已提交
1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366
			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);
1367
			oidcpy(&dst_ref->new_oid, &ref->new_oid);
J
Junio C Hamano 已提交
1368 1369 1370 1371 1372 1373 1374
			dst_ref->peer_ref = copy_ref(ref);
		}
	}
	string_list_clear(&src_tag, 0);
	free(sent_tips.tip);
}

1375 1376 1377 1378 1379 1380 1381 1382
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;
}

1383 1384 1385 1386 1387
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;

1388
	string_list_sort(ref_index);
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
/*
 * 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;
}

1416
/*
1417 1418 1419 1420 1421 1422
 * 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).
1423
 */
1424 1425
int match_push_refs(struct ref *src, struct ref **dst,
		    int nr_refspec, const char **refspec, int flags)
1426
{
1427
	struct refspec *rs;
A
Andy Whitcroft 已提交
1428 1429
	int send_all = flags & MATCH_REFS_ALL;
	int send_mirror = flags & MATCH_REFS_MIRROR;
F
Felipe Contreras 已提交
1430
	int send_prune = flags & MATCH_REFS_PRUNE;
1431
	int errs;
1432
	static const char *default_refspec[] = { ":", NULL };
1433
	struct ref *ref, **dst_tail = tail_ref(dst);
1434
	struct string_list dst_ref_index = STRING_LIST_INIT_NODUP;
1435

1436 1437 1438 1439 1440
	if (!nr_refspec) {
		nr_refspec = 1;
		refspec = default_refspec;
	}
	rs = parse_push_refspec(nr_refspec, (const char **) refspec);
1441
	errs = match_explicit_refs(src, *dst, &dst_tail, rs, nr_refspec);
1442 1443

	/* pick the remainder */
1444
	for (ref = src; ref; ref = ref->next) {
1445
		struct string_list_item *dst_item;
1446
		struct ref *dst_peer;
1447 1448
		const struct refspec *pat = NULL;
		char *dst_name;
1449

F
Felipe Contreras 已提交
1450
		dst_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_SRC, &pat);
1451
		if (!dst_name)
1452 1453
			continue;

1454 1455 1456 1457 1458
		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;
1459 1460 1461 1462 1463 1464 1465 1466 1467
		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 已提交
1468
				 * --all or --mirror.
1469 1470
				 */
				goto free_name;
A
Andy Whitcroft 已提交
1471

1472
			/* Create a new one and link it */
1473
			dst_peer = make_linked_ref(dst_name, &dst_tail);
1474
			oidcpy(&dst_peer->new_oid, &ref->new_oid);
1475 1476
			string_list_insert(&dst_ref_index,
				dst_peer->name)->util = dst_peer;
1477
		}
1478
		dst_peer->peer_ref = copy_ref(ref);
1479
		dst_peer->force = pat->force;
1480 1481
	free_name:
		free(dst_name);
1482
	}
J
Junio C Hamano 已提交
1483

1484 1485
	string_list_clear(&dst_ref_index, 0);

J
Junio C Hamano 已提交
1486 1487 1488
	if (flags & MATCH_REFS_FOLLOW_TAGS)
		add_missing_tags(src, dst, &dst_tail);

F
Felipe Contreras 已提交
1489
	if (send_prune) {
1490
		struct string_list src_ref_index = STRING_LIST_INIT_NODUP;
F
Felipe Contreras 已提交
1491 1492 1493 1494 1495 1496 1497 1498 1499 1500
		/* 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) {
1501 1502 1503 1504
				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 已提交
1505 1506 1507 1508
					ref->peer_ref = alloc_delete_ref();
				free(src_name);
			}
		}
1509
		string_list_clear(&src_ref_index, 0);
F
Felipe Contreras 已提交
1510
	}
1511 1512
	if (errs)
		return -1;
1513 1514
	return 0;
}
1515

1516
void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
1517
			     int force_update)
1518 1519 1520 1521
{
	struct ref *ref;

	for (ref = remote_refs; ref; ref = ref->next) {
1522
		int force_ref_update = ref->force || force_update;
1523
		int reject_reason = 0;
1524

1525
		if (ref->peer_ref)
1526
			oidcpy(&ref->new_oid, &ref->peer_ref->new_oid);
1527 1528 1529
		else if (!send_mirror)
			continue;

1530
		ref->deletion = is_null_oid(&ref->new_oid);
1531
		if (!ref->deletion &&
1532
			!oidcmp(&ref->old_oid, &ref->new_oid)) {
1533 1534 1535 1536
			ref->status = REF_STATUS_UPTODATE;
			continue;
		}

C
Chris Rorvick 已提交
1537
		/*
1538 1539
		 * If the remote ref has moved and is now different
		 * from what we expect, reject any push.
1540 1541 1542 1543 1544 1545 1546
		 *
		 * 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) {
1547
			if (oidcmp(&ref->old_oid, &ref->old_oid_expect))
1548
				reject_reason = REF_STATUS_REJECT_STALE;
1549 1550 1551
			else
				/* If the ref isn't stale then force the update. */
				force_ref_update = 1;
1552 1553 1554
		}

		/*
1555 1556
		 * If the update isn't already rejected then check
		 * the usual "must fast-forward" rules.
1557
		 *
1558 1559 1560
		 * Decide whether an individual refspec A:B can be
		 * pushed.  The push will succeed if any of the
		 * following are true:
1561
		 *
C
Chris Rorvick 已提交
1562
		 * (1) the remote reference B does not exist
1563
		 *
C
Chris Rorvick 已提交
1564 1565
		 * (2) the remote reference B is being removed (i.e.,
		 *     pushing :B where no source is specified)
1566
		 *
1567 1568 1569
		 * (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.
1570
		 *
C
Chris Rorvick 已提交
1571 1572
		 * (4) it is forced using the +A:B notation, or by
		 *     passing the --force argument
1573 1574
		 */

1575
		if (!reject_reason && !ref->deletion && !is_null_oid(&ref->old_oid)) {
1576
			if (starts_with(ref->name, "refs/tags/"))
1577
				reject_reason = REF_STATUS_REJECT_ALREADY_EXISTS;
1578
			else if (!has_object_file(&ref->old_oid))
1579
				reject_reason = REF_STATUS_REJECT_FETCH_FIRST;
1580 1581
			else if (!lookup_commit_reference_gently(ref->old_oid.hash, 1) ||
				 !lookup_commit_reference_gently(ref->new_oid.hash, 1))
1582
				reject_reason = REF_STATUS_REJECT_NEEDS_FORCE;
1583
			else if (!ref_newer(&ref->new_oid, &ref->old_oid))
1584
				reject_reason = REF_STATUS_REJECT_NONFASTFORWARD;
1585
		}
1586 1587 1588 1589 1590 1591 1592 1593 1594

		/*
		 * "--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;
1595 1596 1597
	}
}

1598 1599
static void set_merge(struct branch *ret)
{
1600
	struct remote *remote;
1601
	char *ref;
1602
	struct object_id oid;
1603 1604
	int i;

1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617
	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;
	}

1618 1619
	remote = remote_get(ret->remote_name);

1620 1621 1622 1623
	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]);
1624
		if (!remote_find_tracking(remote, ret->merge[i]) ||
1625 1626 1627
		    strcmp(ret->remote_name, "."))
			continue;
		if (dwim_ref(ret->merge_name[i], strlen(ret->merge_name[i]),
1628
			     oid.hash, &ref) == 1)
1629 1630 1631 1632 1633 1634
			ret->merge[i]->dst = ref;
		else
			ret->merge[i]->dst = xstrdup(ret->merge_name[i]);
	}
}

1635 1636 1637 1638 1639 1640 1641 1642 1643
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);
1644
	set_merge(ret);
1645 1646 1647 1648 1649 1650 1651 1652
	return ret;
}

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

1653 1654 1655
int branch_merge_matches(struct branch *branch,
		                 int i,
		                 const char *refname)
1656
{
1657
	if (!branch || i < 0 || i >= branch->merge_nr)
1658
		return 0;
1659
	return refname_match(branch->merge[i]->src, refname);
1660
}
1661

1662
__attribute__((format (printf,2,3)))
1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677
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"));
1678 1679 1680 1681 1682 1683 1684

	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?
		 */
1685 1686 1687
		if (!ref_exists(branch->refname))
			return error_buf(err, _("no such branch: '%s'"),
					 branch->name);
1688 1689 1690 1691 1692 1693
		return error_buf(err,
				 _("no upstream configured for branch '%s'"),
				 branch->name);
	}

	if (!branch->merge[0]->dst)
1694 1695 1696 1697
		return error_buf(err,
				 _("upstream branch '%s' not stored as a remote-tracking branch"),
				 branch->merge[0]->src);

1698 1699 1700
	return branch->merge[0]->dst;
}

J
Jeff King 已提交
1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785
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;
}

1786 1787
static int ignore_symref_update(const char *refname)
{
1788
	struct object_id oid;
1789 1790
	int flag;

1791
	if (!resolve_ref_unsafe(refname, 0, oid.hash, &flag))
1792 1793 1794 1795
		return 0; /* non-existing refs are OK */
	return (flag & REF_ISSYMREF);
}

1796 1797 1798 1799 1800 1801 1802
/*
 * 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.
 */
1803
static struct ref *get_expanded_map(const struct ref *remote_refs,
1804 1805
				    const struct refspec *refspec)
{
1806
	const struct ref *ref;
1807 1808 1809 1810
	struct ref *ret = NULL;
	struct ref **tail = &ret;

	for (ref = remote_refs; ref; ref = ref->next) {
1811 1812
		char *expn_name = NULL;

1813 1814
		if (strchr(ref->name, '^'))
			continue; /* a dereference item */
1815
		if (match_name_with_pattern(refspec->src, ref->name,
1816 1817
					    refspec->dst, &expn_name) &&
		    !ignore_symref_update(expn_name)) {
1818 1819
			struct ref *cpy = copy_ref(ref);

1820
			cpy->peer_ref = alloc_ref(expn_name);
1821 1822 1823 1824 1825
			if (refspec->force)
				cpy->peer_ref->force = 1;
			*tail = cpy;
			tail = &cpy->next;
		}
1826
		free(expn_name);
1827 1828 1829 1830 1831
	}

	return ret;
}

1832
static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
1833
{
1834
	const struct ref *ref;
1835
	for (ref = refs; ref; ref = ref->next) {
1836
		if (refname_match(name, ref->name))
1837 1838 1839 1840 1841
			return ref;
	}
	return NULL;
}

1842
struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
1843
{
1844
	const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
1845 1846

	if (!ref)
1847
		return NULL;
1848 1849 1850 1851 1852 1853

	return copy_ref(ref);
}

static struct ref *get_local_ref(const char *name)
{
1854
	if (!name || name[0] == '\0')
1855 1856
		return NULL;

1857
	if (starts_with(name, "refs/"))
1858
		return alloc_ref(name);
1859

1860 1861 1862
	if (starts_with(name, "heads/") ||
	    starts_with(name, "tags/") ||
	    starts_with(name, "remotes/"))
R
René Scharfe 已提交
1863
		return alloc_ref_with_prefix("refs/", 5, name);
1864

R
René Scharfe 已提交
1865
	return alloc_ref_with_prefix("refs/heads/", 11, name);
1866 1867
}

1868
int get_fetch_map(const struct ref *remote_refs,
1869
		  const struct refspec *refspec,
1870 1871
		  struct ref ***tail,
		  int missing_ok)
1872
{
D
Daniel Barkalow 已提交
1873
	struct ref *ref_map, **rmp;
1874 1875 1876 1877

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

1880 1881
		if (refspec->exact_sha1) {
			ref_map = alloc_ref(name);
1882
			get_oid_hex(name, &ref_map->old_oid);
1883 1884 1885
		} else {
			ref_map = get_remote_ref(remote_refs, name);
		}
1886 1887 1888 1889 1890 1891 1892
		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;
		}
1893 1894
	}

D
Daniel Barkalow 已提交
1895 1896
	for (rmp = &ref_map; *rmp; ) {
		if ((*rmp)->peer_ref) {
1897
			if (!starts_with((*rmp)->peer_ref->name, "refs/") ||
1898
			    check_refname_format((*rmp)->peer_ref->name, 0)) {
D
Daniel Barkalow 已提交
1899 1900 1901 1902 1903 1904 1905 1906 1907 1908
				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);
1909 1910
	}

1911 1912
	if (ref_map)
		tail_link_ref(ref_map, tail);
1913 1914 1915

	return 0;
}
1916 1917 1918 1919 1920 1921 1922

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)) {
1923
			oidcpy(&ref->old_oid, &list->old_oid);
1924 1925 1926 1927
			return 0;
		}
	return 1;
}
1928

1929 1930 1931
static void unmark_and_free(struct commit_list *list, unsigned int mark)
{
	while (list) {
1932 1933
		struct commit *commit = pop_commit(&list);
		commit->object.flags &= ~mark;
1934 1935 1936
	}
}

1937
int ref_newer(const struct object_id *new_oid, const struct object_id *old_oid)
1938 1939 1940 1941 1942 1943
{
	struct object *o;
	struct commit *old, *new;
	struct commit_list *list, *used;
	int found = 0;

1944 1945
	/*
	 * Both new and old must be commit-ish and new is descendant of
1946 1947
	 * old.  Otherwise we require --force.
	 */
1948
	o = deref_tag(parse_object(old_oid->hash), NULL, 0);
1949 1950 1951 1952
	if (!o || o->type != OBJ_COMMIT)
		return 0;
	old = (struct commit *) o;

1953
	o = deref_tag(parse_object(new_oid->hash), NULL, 0);
1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975
	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;
}

1976
/*
1977
 * Compare a branch with its upstream, and save their differences (number
1978 1979 1980
 * 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.
1981
 *
1982 1983
 * 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.
1984
 */
1985 1986
int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs,
		       const char **upstream_name)
1987
{
1988
	struct object_id oid;
1989 1990
	struct commit *ours, *theirs;
	struct rev_info revs;
1991 1992
	const char *base;
	struct argv_array argv = ARGV_ARRAY_INIT;
1993

1994
	/* Cannot stat unless we are marked to build on top of somebody else. */
1995
	base = branch_get_upstream(branch, NULL);
1996 1997
	if (upstream_name)
		*upstream_name = base;
1998
	if (!base)
1999
		return -1;
2000

2001
	/* Cannot stat if what we used to build on no longer exists */
2002
	if (read_ref(base, oid.hash))
2003
		return -1;
2004
	theirs = lookup_commit_reference(oid.hash);
2005
	if (!theirs)
2006
		return -1;
2007

2008
	if (read_ref(branch->refname, oid.hash))
2009
		return -1;
2010
	ours = lookup_commit_reference(oid.hash);
2011
	if (!ours)
2012
		return -1;
2013 2014

	/* are we the same? */
2015 2016
	if (theirs == ours) {
		*num_theirs = *num_ours = 0;
2017
		return 0;
2018
	}
2019

2020
	/* Run "rev-list --left-right ours...theirs" internally... */
2021 2022 2023
	argv_array_push(&argv, ""); /* ignored */
	argv_array_push(&argv, "--left-right");
	argv_array_pushf(&argv, "%s...%s",
2024 2025
			 oid_to_hex(&ours->object.oid),
			 oid_to_hex(&theirs->object.oid));
2026
	argv_array_push(&argv, "--");
2027 2028

	init_revisions(&revs, NULL);
2029
	setup_revisions(argv.argc, argv.argv, &revs, NULL);
2030 2031
	if (prepare_revision_walk(&revs))
		die("revision walk setup failed");
2032 2033 2034 2035 2036 2037 2038 2039 2040 2041 2042 2043 2044

	/* ... 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)++;
	}
2045 2046 2047 2048

	/* clear object flags smudged by the above traversal */
	clear_commit_marks(ours, ALL_REV_FLAGS);
	clear_commit_marks(theirs, ALL_REV_FLAGS);
2049 2050

	argv_array_clear(&argv);
2051
	return 0;
2052 2053 2054 2055 2056 2057 2058
}

/*
 * Return true when there is anything to report, otherwise false.
 */
int format_tracking_info(struct branch *branch, struct strbuf *sb)
{
2059
	int ours, theirs;
2060
	const char *full_base;
2061
	char *base;
2062
	int upstream_is_gone = 0;
2063

2064 2065 2066
	if (stat_tracking_info(branch, &ours, &theirs, &full_base) < 0) {
		if (!full_base)
			return 0;
2067 2068
		upstream_is_gone = 1;
	}
2069

2070
	base = shorten_unambiguous_ref(full_base, 0);
2071 2072 2073 2074 2075
	if (upstream_is_gone) {
		strbuf_addf(sb,
			_("Your branch is based on '%s', but the upstream is gone.\n"),
			base);
		if (advice_status_hints)
2076
			strbuf_addstr(sb,
2077
				_("  (use \"git branch --unset-upstream\" to fixup)\n"));
2078 2079 2080 2081
	} else if (!ours && !theirs) {
		strbuf_addf(sb,
			_("Your branch is up-to-date with '%s'.\n"),
			base);
2082
	} else if (!theirs) {
2083 2084 2085
		strbuf_addf(sb,
			Q_("Your branch is ahead of '%s' by %d commit.\n",
			   "Your branch is ahead of '%s' by %d commits.\n",
2086 2087
			   ours),
			base, ours);
2088
		if (advice_status_hints)
2089
			strbuf_addstr(sb,
2090
				_("  (use \"git push\" to publish your local commits)\n"));
2091
	} else if (!ours) {
2092 2093 2094 2095 2096
		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",
2097 2098
			   theirs),
			base, theirs);
2099
		if (advice_status_hints)
2100
			strbuf_addstr(sb,
2101
				_("  (use \"git pull\" to update your local branch)\n"));
2102
	} else {
2103 2104 2105 2106 2107 2108 2109
		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",
2110
			   ours + theirs),
2111
			base, ours, theirs);
2112
		if (advice_status_hints)
2113
			strbuf_addstr(sb,
2114
				_("  (use \"git pull\" to merge the remote branch into yours)\n"));
2115
	}
2116
	free(base);
2117 2118
	return 1;
}
2119

2120 2121
static int one_local_ref(const char *refname, const struct object_id *oid,
			 int flag, void *cb_data)
2122 2123 2124 2125 2126
{
	struct ref ***local_tail = cb_data;
	struct ref *ref;

	/* we already know it starts with refs/ to get here */
2127
	if (check_refname_format(refname + 5, 0))
2128 2129
		return 0;

2130
	ref = alloc_ref(refname);
2131
	oidcpy(&ref->new_oid, oid);
2132 2133 2134 2135 2136 2137 2138
	**local_tail = ref;
	*local_tail = &ref->next;
	return 0;
}

struct ref *get_local_heads(void)
{
2139
	struct ref *local_refs = NULL, **local_tail = &local_refs;
2140

2141 2142 2143
	for_each_ref(one_local_ref, &local_tail);
	return local_refs;
}
J
Jay Soffian 已提交
2144

2145 2146 2147
struct ref *guess_remote_head(const struct ref *head,
			      const struct ref *refs,
			      int all)
J
Jay Soffian 已提交
2148 2149
{
	const struct ref *r;
2150 2151
	struct ref *list = NULL;
	struct ref **tail = &list;
J
Jay Soffian 已提交
2152

2153
	if (!head)
J
Jay Soffian 已提交
2154 2155
		return NULL;

2156 2157 2158 2159 2160 2161 2162 2163
	/*
	 * 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 已提交
2164
	/* If refs/heads/master could be right, it is. */
2165 2166
	if (!all) {
		r = find_ref_by_name(refs, "refs/heads/master");
2167
		if (r && !oidcmp(&r->old_oid, &head->old_oid))
2168 2169
			return copy_ref(r);
	}
J
Jay Soffian 已提交
2170 2171

	/* Look for another ref that points there */
2172
	for (r = refs; r; r = r->next) {
2173
		if (r != head &&
2174
		    starts_with(r->name, "refs/heads/") &&
2175
		    !oidcmp(&r->old_oid, &head->old_oid)) {
2176 2177 2178 2179 2180 2181
			*tail = copy_ref(r);
			tail = &((*tail)->next);
			if (!all)
				break;
		}
	}
J
Jay Soffian 已提交
2182

2183
	return list;
J
Jay Soffian 已提交
2184
}
2185 2186 2187 2188

struct stale_heads_info {
	struct string_list *ref_names;
	struct ref **stale_refs_tail;
2189 2190
	struct refspec *refs;
	int ref_count;
2191 2192
};

2193 2194
static int get_stale_heads_cb(const char *refname, const struct object_id *oid,
			      int flags, void *cb_data)
2195 2196
{
	struct stale_heads_info *info = cb_data;
2197
	struct string_list matches = STRING_LIST_INIT_DUP;
2198
	struct refspec query;
2199
	int i, stale = 1;
2200 2201 2202
	memset(&query, 0, sizeof(struct refspec));
	query.dst = (char *)refname;

2203 2204 2205
	query_refspecs_multiple(info->refs, info->ref_count, &query, &matches);
	if (matches.nr == 0)
		goto clean_exit; /* No matches */
2206 2207 2208 2209

	/*
	 * 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
2210 2211 2212
	 * remote, we consider it to be stale. In order to deal with
	 * overlapping refspecs, we need to go over all of the
	 * matching refs.
2213
	 */
2214 2215 2216 2217 2218 2219 2220 2221
	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) {
2222
		struct ref *ref = make_linked_ref(refname, &info->stale_refs_tail);
2223
		oidcpy(&ref->new_oid, oid);
2224
	}
2225

2226 2227
clean_exit:
	string_list_clear(&matches, 0);
2228 2229 2230
	return 0;
}

2231
struct ref *get_stale_heads(struct refspec *refs, int ref_count, struct ref *fetch_map)
2232 2233
{
	struct ref *ref, *stale_refs = NULL;
2234
	struct string_list ref_names = STRING_LIST_INIT_NODUP;
2235
	struct stale_heads_info info;
2236

2237 2238
	info.ref_names = &ref_names;
	info.stale_refs_tail = &stale_refs;
2239 2240
	info.refs = refs;
	info.ref_count = ref_count;
2241
	for (ref = fetch_map; ref; ref = ref->next)
2242
		string_list_append(&ref_names, ref->name);
2243
	string_list_sort(&ref_names);
2244 2245 2246 2247
	for_each_ref(get_stale_heads_cb, &info);
	string_list_clear(&ref_names, 0);
	return stale_refs;
}
2248 2249 2250 2251

/*
 * Compare-and-swap
 */
2252
static void clear_cas_option(struct push_cas_option *cas)
2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 2295
{
	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;
2296 2297
	else if (!colon[1])
		hashclr(entry->expect);
2298 2299 2300 2301 2302 2303 2304 2305 2306
	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);
}
2307 2308 2309 2310 2311 2312 2313 2314 2315 2316 2317 2318 2319

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,
2320
			   struct object_id *oid)
2321 2322 2323 2324 2325 2326
{
	char *dst;

	dst = apply_refspecs(remote->fetch, remote->fetch_refspec_nr, refname);
	if (!dst)
		return -1; /* no tracking ref for refname at remote */
2327
	if (read_ref(dst, oid->hash))
2328 2329 2330 2331 2332 2333 2334 2335 2336 2337 2338 2339 2340
		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];
2341
		if (!refname_match(entry->refname, ref->name))
2342 2343 2344
			continue;
		ref->expect_old_sha1 = 1;
		if (!entry->use_tracking)
2345
			hashcpy(ref->old_oid_expect.hash, cas->entry[i].expect);
2346
		else if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
2347
			oidclr(&ref->old_oid_expect);
2348 2349 2350 2351 2352 2353 2354 2355
		return;
	}

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

	ref->expect_old_sha1 = 1;
2356
	if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
2357
		oidclr(&ref->old_oid_expect);
2358 2359 2360 2361 2362 2363 2364 2365 2366 2367
}

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