remote.c 58.7 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->configured_in_repo = 1;
259
	remote->origin = REMOTE_REMOTES;
260
	while (strbuf_getline(&buf, f) != EOF) {
261
		const char *v;
262

263
		strbuf_rtrim(&buf);
264

265 266 267 268 269 270
		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)));
271
	}
272
	strbuf_release(&buf);
273 274 275 276 277
	fclose(f);
}

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

	if (!f)
		return;
284

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

293
	remote->configured_in_repo = 1;
294
	remote->origin = REMOTE_BRANCHES;
295 296

	/*
297
	 * The branches file would have URL and optionally
298
	 * #branch specified.  The "master" (or specified) branch is
299 300
	 * fetched and stored in the local branch matching the
	 * remote name.
301
	 */
302 303
	frag = strchr(buf.buf, '#');
	if (frag)
304
		*(frag++) = '\0';
305 306 307 308 309 310
	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));
311

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

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

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

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

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

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

458 459
static void read_config(void)
{
460
	static int loaded;
461
	struct object_id oid;
462
	int flag;
463 464

	if (loaded)
465
		return;
466 467
	loaded = 1;

468
	current_branch = NULL;
469 470 471 472 473 474
	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);
		}
475
	}
476
	git_config(handle_config, NULL);
477
	alias_all_urls();
478 479
}

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

	if (!refspec)
		return;

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

500
static struct refspec *parse_refspec_internal(int nr_refspec, const char **refspec, int fetch, int verify)
501 502
{
	int i;
503
	struct refspec *rs = xcalloc(nr_refspec, sizeof(*rs));
504

505
	for (i = 0; i < nr_refspec; i++) {
506
		size_t llen;
507 508
		int is_glob;
		const char *lhs, *rhs;
509
		int flags;
510

B
Benjamin Kramer 已提交
511
		is_glob = 0;
512 513 514

		lhs = refspec[i];
		if (*lhs == '+') {
515
			rs[i].force = 1;
516
			lhs++;
517
		}
518 519

		rhs = strrchr(lhs, ':');
520 521 522

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

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

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

545 546
		rs[i].pattern = is_glob;
		rs[i].src = xstrndup(lhs, llen);
547
		flags = REFNAME_ALLOW_ONELEVEL | (is_glob ? REFNAME_REFSPEC_PATTERN : 0);
548 549

		if (fetch) {
550
			struct object_id unused;
551

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

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

619 620 621 622
int valid_fetch_refspec(const char *fetch_refspec_str)
{
	struct refspec *refspec;

623
	refspec = parse_refspec_internal(1, &fetch_refspec_str, 1, 1);
624
	free_refspecs(refspec, 1);
625 626 627
	return !!refspec;
}

628 629
struct refspec *parse_fetch_refspec(int nr_refspec, const char **refspec)
{
630
	return parse_refspec_internal(nr_refspec, refspec, 1, 0);
631 632
}

633
struct refspec *parse_push_refspec(int nr_refspec, const char **refspec)
634
{
635
	return parse_refspec_internal(nr_refspec, refspec, 0, 0);
636 637
}

638 639 640 641 642 643 644 645 646 647
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);
}

648 649
static int valid_remote_nick(const char *name)
{
650
	if (!name[0] || is_dot_or_dotdot(name))
651 652 653 654
		return 0;
	return !strchr(name, '/'); /* no slash */
}

655 656 657 658 659 660 661 662 663 664 665 666
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";
}

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

688 689
	read_config();

690 691
	if (name)
		name_given = 1;
692 693
	else
		name = get_default(current_branch, &name_given);
694

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

711 712
struct remote *remote_get(const char *name)
{
713
	return remote_get_1(name, remote_for_branch);
714 715 716 717
}

struct remote *pushremote_get(const char *name)
{
718
	return remote_get_1(name, pushremote_for_branch);
719 720
}

721
int remote_is_configured(struct remote *remote, int in_repo)
722
{
723 724 725 726 727
	if (!remote)
		return 0;
	if (in_repo)
		return remote->configured_in_repo;
	return !!remote->origin;
728 729
}

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

749 750
static void handle_duplicate(struct ref *ref1, struct ref *ref2)
{
751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772
	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"));
		}
	}
773 774 775 776
	free(ref2->peer_ref);
	free(ref2);
}

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

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

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

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

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

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

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

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

849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874
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);
		}
	}
}

875
int query_refspecs(struct refspec *refs, int ref_count, struct refspec *query)
876 877
{
	int i;
878
	int find_src = !query->src;
879 880
	const char *needle = find_src ? query->dst : query->src;
	char **result = find_src ? &query->src : &query->dst;
881

882 883
	if (find_src && !query->dst)
		return error("query_refspecs: need either src or dst");
884

885 886 887 888
	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;
889

890
		if (!refspec->dst)
891
			continue;
892
		if (refspec->pattern) {
893
			if (match_name_with_pattern(key, needle, value, result)) {
894
				query->force = refspec->force;
895 896
				return 0;
			}
897 898
		} else if (!strcmp(needle, key)) {
			*result = xstrdup(value);
899
			query->force = refspec->force;
900
			return 0;
901 902 903 904 905
		}
	}
	return -1;
}

906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924
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 已提交
925 926 927 928
static struct ref *alloc_ref_with_prefix(const char *prefix, size_t prefixlen,
		const char *name)
{
	size_t len = strlen(name);
929
	struct ref *ref = xcalloc(1, st_add4(sizeof(*ref), prefixlen, len, 1));
R
René Scharfe 已提交
930 931 932 933 934
	memcpy(ref->name, prefix, prefixlen);
	memcpy(ref->name + prefixlen, name, len);
	return ref;
}

935
struct ref *alloc_ref(const char *name)
936
{
937
	return alloc_ref_with_prefix("", 0, name);
938 939
}

J
Jeff King 已提交
940
struct ref *copy_ref(const struct ref *ref)
941
{
942 943 944 945
	struct ref *cpy;
	size_t len;
	if (!ref)
		return NULL;
946 947 948
	len = st_add3(sizeof(struct ref), strlen(ref->name), 1);
	cpy = xmalloc(len);
	memcpy(cpy, ref, len);
949
	cpy->next = NULL;
950 951
	cpy->symref = xstrdup_or_null(ref->symref);
	cpy->remote_status = xstrdup_or_null(ref->remote_status);
952 953
	cpy->peer_ref = copy_ref(ref->peer_ref);
	return cpy;
954 955
}

956 957 958 959 960 961 962 963 964 965 966 967
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;
}

968
static void free_ref(struct ref *ref)
969 970 971
{
	if (!ref)
		return;
972
	free_ref(ref->peer_ref);
973 974 975 976 977
	free(ref->remote_status);
	free(ref->symref);
	free(ref);
}

978 979 980 981 982
void free_refs(struct ref *ref)
{
	struct ref *next;
	while (ref) {
		next = ref->next;
983
		free_ref(ref);
984 985 986 987
		ref = next;
	}
}

988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008
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);
}

1009 1010 1011
int count_refspec_match(const char *pattern,
			struct ref *refs,
			struct ref **matched_ref)
1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022
{
	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);

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

1065
static void tail_link_ref(struct ref *ref, struct ref ***tail)
1066 1067
{
	**tail = ref;
1068 1069
	while (ref->next)
		ref = ref->next;
1070 1071 1072
	*tail = &ref->next;
}

1073 1074 1075
static struct ref *alloc_delete_ref(void)
{
	struct ref *ref = alloc_ref("(delete)");
1076
	oidclr(&ref->new_oid);
1077 1078 1079
	return ref;
}

1080 1081
static int try_explicit_object_name(const char *name,
				    struct ref **match)
1082
{
1083
	struct object_id oid;
1084

1085 1086 1087 1088 1089 1090
	if (!*name) {
		if (match)
			*match = alloc_delete_ref();
		return 0;
	}

1091
	if (get_sha1(name, oid.hash))
1092 1093 1094 1095
		return -1;

	if (match) {
		*match = alloc_ref(name);
1096
		oidcpy(&(*match)->new_oid, &oid);
1097 1098
	}
	return 0;
1099 1100
}

1101
static struct ref *make_linked_ref(const char *name, struct ref ***tail)
1102
{
1103
	struct ref *ret = alloc_ref(name);
1104 1105
	tail_link_ref(ret, tail);
	return ret;
1106
}
1107

1108 1109 1110
static char *guess_ref(const char *name, struct ref *peer)
{
	struct strbuf buf = STRBUF_INIT;
1111
	struct object_id oid;
1112

1113
	const char *r = resolve_ref_unsafe(peer->name, RESOLVE_REF_READING,
1114
					   oid.hash, NULL);
1115 1116 1117
	if (!r)
		return NULL;

1118
	if (starts_with(r, "refs/heads/"))
1119
		strbuf_addstr(&buf, "refs/heads/");
1120
	else if (starts_with(r, "refs/tags/"))
1121 1122 1123 1124 1125 1126 1127 1128
		strbuf_addstr(&buf, "refs/tags/");
	else
		return NULL;

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

1129 1130 1131 1132 1133 1134 1135
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:
1136 1137
		if (allocated_match)
			*allocated_match = 0;
1138 1139 1140 1141 1142 1143
		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.
		 */
1144
		if (try_explicit_object_name(rs->src, match) < 0)
1145
			return error("src refspec %s does not match any.", rs->src);
1146 1147
		if (allocated_match)
			*allocated_match = 1;
1148 1149 1150 1151 1152 1153
		return 0;
	default:
		return error("src refspec %s matches more than one.", rs->src);
	}
}

1154 1155
static int match_explicit(struct ref *src, struct ref *dst,
			  struct ref ***dst_tail,
1156
			  struct refspec *rs)
1157
{
1158
	struct ref *matched_src, *matched_dst;
1159
	int allocated_src;
1160

1161
	const char *dst_value = rs->dst;
1162
	char *dst_guess;
1163

1164
	if (rs->pattern || rs->matching)
1165
		return 0;
1166

1167
	matched_src = matched_dst = NULL;
1168 1169
	if (match_explicit_lhs(src, rs, &matched_src, &allocated_src) < 0)
		return -1;
1170

1171
	if (!dst_value) {
1172
		struct object_id oid;
1173 1174
		int flag;

1175 1176
		dst_value = resolve_ref_unsafe(matched_src->name,
					       RESOLVE_REF_READING,
1177
					       oid.hash, &flag);
1178 1179
		if (!dst_value ||
		    ((flag & REF_ISSYMREF) &&
1180
		     !starts_with(dst_value, "refs/heads/")))
1181 1182
			die("%s cannot be resolved to branch.",
			    matched_src->name);
1183
	}
1184

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

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

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

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

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

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

J
Junio C Hamano 已提交
1288 1289 1290 1291 1292
struct tips {
	struct commit **tip;
	int nr, alloc;
};

1293
static void add_to_tips(struct tips *tips, const struct object_id *oid)
J
Junio C Hamano 已提交
1294 1295 1296
{
	struct commit *commit;

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

1331
	string_list_sort(&dst_tag);
J
Junio C Hamano 已提交
1332 1333 1334

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

1359
			if (is_null_oid(&ref->new_oid))
J
Junio C Hamano 已提交
1360
				continue;
1361
			commit = lookup_commit_reference_gently(ref->new_oid.hash, 1);
J
Junio C Hamano 已提交
1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374
			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);
1375
			oidcpy(&dst_ref->new_oid, &ref->new_oid);
J
Junio C Hamano 已提交
1376 1377 1378 1379 1380 1381 1382
			dst_ref->peer_ref = copy_ref(ref);
		}
	}
	string_list_clear(&src_tag, 0);
	free(sent_tips.tip);
}

1383 1384 1385 1386 1387 1388 1389 1390
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;
}

1391 1392 1393 1394 1395
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;

1396
	string_list_sort(ref_index);
1397 1398
}

1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423
/*
 * 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;
}

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

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

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

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

1462 1463 1464 1465 1466
		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;
1467 1468 1469 1470 1471 1472 1473 1474 1475
		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 已提交
1476
				 * --all or --mirror.
1477 1478
				 */
				goto free_name;
A
Andy Whitcroft 已提交
1479

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

1492 1493
	string_list_clear(&dst_ref_index, 0);

J
Junio C Hamano 已提交
1494 1495 1496
	if (flags & MATCH_REFS_FOLLOW_TAGS)
		add_missing_tags(src, dst, &dst_tail);

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

1524
void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
1525
			     int force_update)
1526 1527 1528 1529
{
	struct ref *ref;

	for (ref = remote_refs; ref; ref = ref->next) {
1530
		int force_ref_update = ref->force || force_update;
1531
		int reject_reason = 0;
1532

1533
		if (ref->peer_ref)
1534
			oidcpy(&ref->new_oid, &ref->peer_ref->new_oid);
1535 1536 1537
		else if (!send_mirror)
			continue;

1538
		ref->deletion = is_null_oid(&ref->new_oid);
1539
		if (!ref->deletion &&
1540
			!oidcmp(&ref->old_oid, &ref->new_oid)) {
1541 1542 1543 1544
			ref->status = REF_STATUS_UPTODATE;
			continue;
		}

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

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

1583
		if (!reject_reason && !ref->deletion && !is_null_oid(&ref->old_oid)) {
1584
			if (starts_with(ref->name, "refs/tags/"))
1585
				reject_reason = REF_STATUS_REJECT_ALREADY_EXISTS;
1586
			else if (!has_object_file(&ref->old_oid))
1587
				reject_reason = REF_STATUS_REJECT_FETCH_FIRST;
1588 1589
			else if (!lookup_commit_reference_gently(ref->old_oid.hash, 1) ||
				 !lookup_commit_reference_gently(ref->new_oid.hash, 1))
1590
				reject_reason = REF_STATUS_REJECT_NEEDS_FORCE;
1591
			else if (!ref_newer(&ref->new_oid, &ref->old_oid))
1592
				reject_reason = REF_STATUS_REJECT_NONFASTFORWARD;
1593
		}
1594 1595 1596 1597 1598 1599 1600 1601 1602

		/*
		 * "--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;
1603 1604 1605
	}
}

1606 1607
static void set_merge(struct branch *ret)
{
1608
	struct remote *remote;
1609
	char *ref;
1610
	struct object_id oid;
1611 1612
	int i;

1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625
	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;
	}

1626 1627
	remote = remote_get(ret->remote_name);

1628 1629 1630 1631
	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]);
1632
		if (!remote_find_tracking(remote, ret->merge[i]) ||
1633 1634 1635
		    strcmp(ret->remote_name, "."))
			continue;
		if (dwim_ref(ret->merge_name[i], strlen(ret->merge_name[i]),
1636
			     oid.hash, &ref) == 1)
1637 1638 1639 1640 1641 1642
			ret->merge[i]->dst = ref;
		else
			ret->merge[i]->dst = xstrdup(ret->merge_name[i]);
	}
}

1643 1644 1645 1646 1647 1648 1649 1650 1651
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);
1652
	set_merge(ret);
1653 1654 1655 1656 1657 1658 1659 1660
	return ret;
}

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

1661 1662 1663
int branch_merge_matches(struct branch *branch,
		                 int i,
		                 const char *refname)
1664
{
1665
	if (!branch || i < 0 || i >= branch->merge_nr)
1666
		return 0;
1667
	return refname_match(branch->merge[i]->src, refname);
1668
}
1669

1670
__attribute__((format (printf,2,3)))
1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685
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"));
1686 1687 1688 1689 1690 1691 1692

	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?
		 */
1693 1694 1695
		if (!ref_exists(branch->refname))
			return error_buf(err, _("no such branch: '%s'"),
					 branch->name);
1696 1697 1698 1699 1700 1701
		return error_buf(err,
				 _("no upstream configured for branch '%s'"),
				 branch->name);
	}

	if (!branch->merge[0]->dst)
1702 1703 1704 1705
		return error_buf(err,
				 _("upstream branch '%s' not stored as a remote-tracking branch"),
				 branch->merge[0]->src);

1706 1707 1708
	return branch->merge[0]->dst;
}

J
Jeff King 已提交
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;

	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)
{
1786 1787 1788
	if (!branch)
		return error_buf(err, _("HEAD does not point to a branch"));

J
Jeff King 已提交
1789 1790 1791 1792 1793
	if (!branch->push_tracking_ref)
		branch->push_tracking_ref = branch_get_push_1(branch, err);
	return branch->push_tracking_ref;
}

1794 1795
static int ignore_symref_update(const char *refname)
{
1796
	struct object_id oid;
1797 1798
	int flag;

1799
	if (!resolve_ref_unsafe(refname, 0, oid.hash, &flag))
1800 1801 1802 1803
		return 0; /* non-existing refs are OK */
	return (flag & REF_ISSYMREF);
}

1804 1805 1806 1807 1808 1809 1810
/*
 * 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.
 */
1811
static struct ref *get_expanded_map(const struct ref *remote_refs,
1812 1813
				    const struct refspec *refspec)
{
1814
	const struct ref *ref;
1815 1816 1817 1818
	struct ref *ret = NULL;
	struct ref **tail = &ret;

	for (ref = remote_refs; ref; ref = ref->next) {
1819 1820
		char *expn_name = NULL;

1821 1822
		if (strchr(ref->name, '^'))
			continue; /* a dereference item */
1823
		if (match_name_with_pattern(refspec->src, ref->name,
1824 1825
					    refspec->dst, &expn_name) &&
		    !ignore_symref_update(expn_name)) {
1826 1827
			struct ref *cpy = copy_ref(ref);

1828
			cpy->peer_ref = alloc_ref(expn_name);
1829 1830 1831 1832 1833
			if (refspec->force)
				cpy->peer_ref->force = 1;
			*tail = cpy;
			tail = &cpy->next;
		}
1834
		free(expn_name);
1835 1836 1837 1838 1839
	}

	return ret;
}

1840
static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
1841
{
1842
	const struct ref *ref;
1843
	for (ref = refs; ref; ref = ref->next) {
1844
		if (refname_match(name, ref->name))
1845 1846 1847 1848 1849
			return ref;
	}
	return NULL;
}

1850
struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
1851
{
1852
	const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
1853 1854

	if (!ref)
1855
		return NULL;
1856 1857 1858 1859 1860 1861

	return copy_ref(ref);
}

static struct ref *get_local_ref(const char *name)
{
1862
	if (!name || name[0] == '\0')
1863 1864
		return NULL;

1865
	if (starts_with(name, "refs/"))
1866
		return alloc_ref(name);
1867

1868 1869 1870
	if (starts_with(name, "heads/") ||
	    starts_with(name, "tags/") ||
	    starts_with(name, "remotes/"))
R
René Scharfe 已提交
1871
		return alloc_ref_with_prefix("refs/", 5, name);
1872

R
René Scharfe 已提交
1873
	return alloc_ref_with_prefix("refs/heads/", 11, name);
1874 1875
}

1876
int get_fetch_map(const struct ref *remote_refs,
1877
		  const struct refspec *refspec,
1878 1879
		  struct ref ***tail,
		  int missing_ok)
1880
{
D
Daniel Barkalow 已提交
1881
	struct ref *ref_map, **rmp;
1882 1883 1884 1885

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

1888 1889
		if (refspec->exact_sha1) {
			ref_map = alloc_ref(name);
1890
			get_oid_hex(name, &ref_map->old_oid);
1891 1892 1893
		} else {
			ref_map = get_remote_ref(remote_refs, name);
		}
1894 1895 1896 1897 1898 1899 1900
		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;
		}
1901 1902
	}

D
Daniel Barkalow 已提交
1903 1904
	for (rmp = &ref_map; *rmp; ) {
		if ((*rmp)->peer_ref) {
1905
			if (!starts_with((*rmp)->peer_ref->name, "refs/") ||
1906
			    check_refname_format((*rmp)->peer_ref->name, 0)) {
D
Daniel Barkalow 已提交
1907 1908 1909 1910 1911 1912 1913 1914 1915 1916
				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);
1917 1918
	}

1919 1920
	if (ref_map)
		tail_link_ref(ref_map, tail);
1921 1922 1923

	return 0;
}
1924 1925 1926 1927 1928 1929 1930

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)) {
1931
			oidcpy(&ref->old_oid, &list->old_oid);
1932 1933 1934 1935
			return 0;
		}
	return 1;
}
1936

1937 1938 1939
static void unmark_and_free(struct commit_list *list, unsigned int mark)
{
	while (list) {
1940 1941
		struct commit *commit = pop_commit(&list);
		commit->object.flags &= ~mark;
1942 1943 1944
	}
}

1945
int ref_newer(const struct object_id *new_oid, const struct object_id *old_oid)
1946 1947 1948 1949 1950 1951
{
	struct object *o;
	struct commit *old, *new;
	struct commit_list *list, *used;
	int found = 0;

1952 1953
	/*
	 * Both new and old must be commit-ish and new is descendant of
1954 1955
	 * old.  Otherwise we require --force.
	 */
1956
	o = deref_tag(parse_object(old_oid->hash), NULL, 0);
1957 1958 1959 1960
	if (!o || o->type != OBJ_COMMIT)
		return 0;
	old = (struct commit *) o;

1961
	o = deref_tag(parse_object(new_oid->hash), NULL, 0);
1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983
	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;
}

1984
/*
1985
 * Compare a branch with its upstream, and save their differences (number
1986 1987 1988
 * 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.
1989
 *
1990 1991
 * 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.
1992
 */
1993 1994
int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs,
		       const char **upstream_name)
1995
{
1996
	struct object_id oid;
1997 1998
	struct commit *ours, *theirs;
	struct rev_info revs;
1999 2000
	const char *base;
	struct argv_array argv = ARGV_ARRAY_INIT;
2001

2002
	/* Cannot stat unless we are marked to build on top of somebody else. */
2003
	base = branch_get_upstream(branch, NULL);
2004 2005
	if (upstream_name)
		*upstream_name = base;
2006
	if (!base)
2007
		return -1;
2008

2009
	/* Cannot stat if what we used to build on no longer exists */
2010
	if (read_ref(base, oid.hash))
2011
		return -1;
2012
	theirs = lookup_commit_reference(oid.hash);
2013
	if (!theirs)
2014
		return -1;
2015

2016
	if (read_ref(branch->refname, oid.hash))
2017
		return -1;
2018
	ours = lookup_commit_reference(oid.hash);
2019
	if (!ours)
2020
		return -1;
2021 2022

	/* are we the same? */
2023 2024
	if (theirs == ours) {
		*num_theirs = *num_ours = 0;
2025
		return 0;
2026
	}
2027

2028
	/* Run "rev-list --left-right ours...theirs" internally... */
2029 2030 2031
	argv_array_push(&argv, ""); /* ignored */
	argv_array_push(&argv, "--left-right");
	argv_array_pushf(&argv, "%s...%s",
2032 2033
			 oid_to_hex(&ours->object.oid),
			 oid_to_hex(&theirs->object.oid));
2034
	argv_array_push(&argv, "--");
2035 2036

	init_revisions(&revs, NULL);
2037
	setup_revisions(argv.argc, argv.argv, &revs, NULL);
2038 2039
	if (prepare_revision_walk(&revs))
		die("revision walk setup failed");
2040 2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052

	/* ... 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)++;
	}
2053 2054 2055 2056

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

	argv_array_clear(&argv);
2059
	return 0;
2060 2061 2062 2063 2064 2065 2066
}

/*
 * Return true when there is anything to report, otherwise false.
 */
int format_tracking_info(struct branch *branch, struct strbuf *sb)
{
2067
	int ours, theirs;
2068
	const char *full_base;
2069
	char *base;
2070
	int upstream_is_gone = 0;
2071

2072 2073 2074
	if (stat_tracking_info(branch, &ours, &theirs, &full_base) < 0) {
		if (!full_base)
			return 0;
2075 2076
		upstream_is_gone = 1;
	}
2077

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

2128 2129
static int one_local_ref(const char *refname, const struct object_id *oid,
			 int flag, void *cb_data)
2130 2131 2132 2133 2134
{
	struct ref ***local_tail = cb_data;
	struct ref *ref;

	/* we already know it starts with refs/ to get here */
2135
	if (check_refname_format(refname + 5, 0))
2136 2137
		return 0;

2138
	ref = alloc_ref(refname);
2139
	oidcpy(&ref->new_oid, oid);
2140 2141 2142 2143 2144 2145 2146
	**local_tail = ref;
	*local_tail = &ref->next;
	return 0;
}

struct ref *get_local_heads(void)
{
2147
	struct ref *local_refs = NULL, **local_tail = &local_refs;
2148

2149 2150 2151
	for_each_ref(one_local_ref, &local_tail);
	return local_refs;
}
J
Jay Soffian 已提交
2152

2153 2154 2155
struct ref *guess_remote_head(const struct ref *head,
			      const struct ref *refs,
			      int all)
J
Jay Soffian 已提交
2156 2157
{
	const struct ref *r;
2158 2159
	struct ref *list = NULL;
	struct ref **tail = &list;
J
Jay Soffian 已提交
2160

2161
	if (!head)
J
Jay Soffian 已提交
2162 2163
		return NULL;

2164 2165 2166 2167 2168 2169 2170 2171
	/*
	 * 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 已提交
2172
	/* If refs/heads/master could be right, it is. */
2173 2174
	if (!all) {
		r = find_ref_by_name(refs, "refs/heads/master");
2175
		if (r && !oidcmp(&r->old_oid, &head->old_oid))
2176 2177
			return copy_ref(r);
	}
J
Jay Soffian 已提交
2178 2179

	/* Look for another ref that points there */
2180
	for (r = refs; r; r = r->next) {
2181
		if (r != head &&
2182
		    starts_with(r->name, "refs/heads/") &&
2183
		    !oidcmp(&r->old_oid, &head->old_oid)) {
2184 2185 2186 2187 2188 2189
			*tail = copy_ref(r);
			tail = &((*tail)->next);
			if (!all)
				break;
		}
	}
J
Jay Soffian 已提交
2190

2191
	return list;
J
Jay Soffian 已提交
2192
}
2193 2194 2195 2196

struct stale_heads_info {
	struct string_list *ref_names;
	struct ref **stale_refs_tail;
2197 2198
	struct refspec *refs;
	int ref_count;
2199 2200
};

2201 2202
static int get_stale_heads_cb(const char *refname, const struct object_id *oid,
			      int flags, void *cb_data)
2203 2204
{
	struct stale_heads_info *info = cb_data;
2205
	struct string_list matches = STRING_LIST_INIT_DUP;
2206
	struct refspec query;
2207
	int i, stale = 1;
2208 2209 2210
	memset(&query, 0, sizeof(struct refspec));
	query.dst = (char *)refname;

2211 2212 2213
	query_refspecs_multiple(info->refs, info->ref_count, &query, &matches);
	if (matches.nr == 0)
		goto clean_exit; /* No matches */
2214 2215 2216 2217

	/*
	 * 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
2218 2219 2220
	 * remote, we consider it to be stale. In order to deal with
	 * overlapping refspecs, we need to go over all of the
	 * matching refs.
2221
	 */
2222 2223 2224 2225 2226 2227 2228 2229
	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) {
2230
		struct ref *ref = make_linked_ref(refname, &info->stale_refs_tail);
2231
		oidcpy(&ref->new_oid, oid);
2232
	}
2233

2234 2235
clean_exit:
	string_list_clear(&matches, 0);
2236 2237 2238
	return 0;
}

2239
struct ref *get_stale_heads(struct refspec *refs, int ref_count, struct ref *fetch_map)
2240 2241
{
	struct ref *ref, *stale_refs = NULL;
2242
	struct string_list ref_names = STRING_LIST_INIT_NODUP;
2243
	struct stale_heads_info info;
2244

2245 2246
	info.ref_names = &ref_names;
	info.stale_refs_tail = &stale_refs;
2247 2248
	info.refs = refs;
	info.ref_count = ref_count;
2249
	for (ref = fetch_map; ref; ref = ref->next)
2250
		string_list_append(&ref_names, ref->name);
2251
	string_list_sort(&ref_names);
2252 2253 2254 2255
	for_each_ref(get_stale_heads_cb, &info);
	string_list_clear(&ref_names, 0);
	return stale_refs;
}
2256 2257 2258 2259

/*
 * Compare-and-swap
 */
2260
static void clear_cas_option(struct push_cas_option *cas)
2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 2281
{
	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;
}

2282
static int parse_push_cas_option(struct push_cas_option *cas, const char *arg, int unset)
2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 2295 2296 2297 2298 2299 2300 2301 2302 2303
{
	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;
2304 2305
	else if (!colon[1])
		hashclr(entry->expect);
2306 2307 2308 2309 2310 2311 2312 2313 2314
	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);
}
2315 2316 2317 2318 2319 2320 2321 2322 2323 2324 2325 2326 2327

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,
2328
			   struct object_id *oid)
2329 2330 2331 2332 2333 2334
{
	char *dst;

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

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

	ref->expect_old_sha1 = 1;
2364
	if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
2365
		oidclr(&ref->old_oid_expect);
2366 2367 2368 2369 2370 2371 2372 2373 2374 2375
}

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