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

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

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

25
/* See TAG_REFSPEC for the string version */
26 27
const struct refspec *tag_refspec = &s_tag_refspec;

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

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

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

static struct branch *current_branch;
55
static const char *pushremote_name;
56

57
static struct rewrites rewrites;
58
static struct rewrites rewrites_push;
59

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

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

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

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

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

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

107 108 109 110 111 112 113 114 115 116 117
void add_prune_tags_to_fetch_refspec(struct remote *remote)
{
	int nr = remote->fetch_refspec_nr;
	int bufsize = nr  + 1;
	int size = sizeof(struct refspec);

	remote->fetch = xrealloc(remote->fetch, size  * bufsize);
	memcpy(&remote->fetch[nr], tag_refspec, size);
	add_fetch_refspec(remote, xstrdup(TAG_REFSPEC));
}

118
static void add_url(struct remote *remote, const char *url)
119
{
D
Daniel Barkalow 已提交
120 121
	ALLOC_GROW(remote->url, remote->url_nr + 1, remote->url_alloc);
	remote->url[remote->url_nr++] = url;
122 123
}

124 125 126 127 128 129
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;
}

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

143 144 145 146 147
struct remotes_hash_key {
	const char *str;
	int len;
};

148
static int remotes_hash_cmp(const void *unused_cmp_data,
149 150 151
			    const void *entry,
			    const void *entry_or_key,
			    const void *keydata)
152
{
153 154 155 156
	const struct remote *a = entry;
	const struct remote *b = entry_or_key;
	const struct remotes_hash_key *key = keydata;

157 158 159 160 161 162 163 164 165
	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)
166
		hashmap_init(&remotes_hash, remotes_hash_cmp, NULL, 0);
167 168
}

169 170
static struct remote *make_remote(const char *name, int len)
{
171 172 173
	struct remote *ret, *replaced;
	struct remotes_hash_key lookup;
	struct hashmap_entry lookup_entry;
174

175 176 177 178 179 180 181 182 183 184
	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;
185

D
Daniel Barkalow 已提交
186
	ret = xcalloc(1, sizeof(struct remote));
187
	ret->prune = -1;  /* unspecified */
188
	ret->prune_tags = -1;  /* unspecified */
D
Daniel Barkalow 已提交
189 190
	ALLOC_GROW(remotes, remotes_nr + 1, remotes_alloc);
	remotes[remotes_nr++] = ret;
191 192 193 194 195
	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 已提交
196
	return ret;
197 198
}

199 200
static void add_merge(struct branch *branch, const char *name)
{
D
Daniel Barkalow 已提交
201 202 203
	ALLOC_GROW(branch->merge_name, branch->merge_nr + 1,
		   branch->merge_alloc);
	branch->merge_name[branch->merge_nr++] = name;
204 205 206 207
}

static struct branch *make_branch(const char *name, int len)
{
D
Daniel Barkalow 已提交
208 209
	struct branch *ret;
	int i;
210

D
Daniel Barkalow 已提交
211 212 213 214 215
	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];
216 217
	}

D
Daniel Barkalow 已提交
218 219 220
	ALLOC_GROW(branches, branches_nr + 1, branches_alloc);
	ret = xcalloc(1, sizeof(struct branch));
	branches[branches_nr++] = ret;
221
	if (len)
D
Daniel Barkalow 已提交
222
		ret->name = xstrndup(name, len);
223
	else
D
Daniel Barkalow 已提交
224
		ret->name = xstrdup(name);
225
	ret->refname = xstrfmt("refs/heads/%s", ret->name);
226

D
Daniel Barkalow 已提交
227
	return ret;
228 229
}

230
static struct rewrite *make_rewrite(struct rewrites *r, const char *base, int len)
231 232 233 234
{
	struct rewrite *ret;
	int i;

235
	for (i = 0; i < r->rewrite_nr; i++) {
236
		if (len
237 238 239 240
		    ? (len == r->rewrite[i]->baselen &&
		       !strncmp(base, r->rewrite[i]->base, len))
		    : !strcmp(base, r->rewrite[i]->base))
			return r->rewrite[i];
241 242
	}

243
	ALLOC_GROW(r->rewrite, r->rewrite_nr + 1, r->rewrite_alloc);
244
	ret = xcalloc(1, sizeof(struct rewrite));
245
	r->rewrite[r->rewrite_nr++] = ret;
246
	if (len) {
247
		ret->base = xstrndup(base, len);
248 249 250
		ret->baselen = len;
	}
	else {
251
		ret->base = xstrdup(base);
252 253
		ret->baselen = strlen(base);
	}
254 255 256 257 258 259
	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);
260 261 262
	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++;
263 264
}

265 266 267 268 269 270 271
static const char *skip_spaces(const char *s)
{
	while (isspace(*s))
		s++;
	return s;
}

272 273
static void read_remotes_file(struct remote *remote)
{
274
	struct strbuf buf = STRBUF_INIT;
275
	FILE *f = fopen_or_warn(git_path("remotes/%s", remote->name), "r");
276 277 278

	if (!f)
		return;
279
	remote->configured_in_repo = 1;
280
	remote->origin = REMOTE_REMOTES;
281
	while (strbuf_getline(&buf, f) != EOF) {
282
		const char *v;
283

284
		strbuf_rtrim(&buf);
285

286 287 288 289 290 291
		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)));
292
	}
293
	strbuf_release(&buf);
294 295 296 297 298
	fclose(f);
}

static void read_branches_file(struct remote *remote)
{
299
	char *frag;
300
	struct strbuf buf = STRBUF_INIT;
301
	FILE *f = fopen_or_warn(git_path("branches/%s", remote->name), "r");
302 303 304

	if (!f)
		return;
305

306
	strbuf_getline_lf(&buf, f);
307
	fclose(f);
308 309 310
	strbuf_trim(&buf);
	if (!buf.len) {
		strbuf_release(&buf);
311
		return;
312 313
	}

314
	remote->configured_in_repo = 1;
315
	remote->origin = REMOTE_BRANCHES;
316 317

	/*
318
	 * The branches file would have URL and optionally
319
	 * #branch specified.  The "master" (or specified) branch is
320 321
	 * fetched and stored in the local branch matching the
	 * remote name.
322
	 */
323 324
	frag = strchr(buf.buf, '#');
	if (frag)
325
		*(frag++) = '\0';
326 327 328 329 330 331
	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));
332

333 334 335 336
	/*
	 * Cogito compatible push: push current HEAD to remote #branch
	 * (master if missing)
	 */
337
	add_push_refspec(remote, xstrfmt("HEAD:refs/heads/%s", frag));
338
	remote->fetch_tags = 1; /* always auto-follow */
339 340
}

341
static int handle_config(const char *key, const char *value, void *cb)
342 343
{
	const char *name;
T
Thomas Gummerer 已提交
344
	int namelen;
345 346
	const char *subkey;
	struct remote *remote;
347
	struct branch *branch;
T
Thomas Gummerer 已提交
348 349
	if (parse_config_key(key, "branch", &name, &namelen, &subkey) >= 0) {
		if (!name)
350
			return 0;
T
Thomas Gummerer 已提交
351 352
		branch = make_branch(name, namelen);
		if (!strcmp(subkey, "remote")) {
353
			return git_config_string(&branch->remote_name, key, value);
T
Thomas Gummerer 已提交
354
		} else if (!strcmp(subkey, "pushremote")) {
355
			return git_config_string(&branch->pushremote_name, key, value);
T
Thomas Gummerer 已提交
356
		} else if (!strcmp(subkey, "merge")) {
357 358
			if (!value)
				return config_error_nonbool(key);
359
			add_merge(branch, xstrdup(value));
360
		}
361
		return 0;
362
	}
T
Thomas Gummerer 已提交
363
	if (parse_config_key(key, "url", &name, &namelen, &subkey) >= 0) {
364
		struct rewrite *rewrite;
T
Thomas Gummerer 已提交
365
		if (!name)
366
			return 0;
T
Thomas Gummerer 已提交
367 368
		if (!strcmp(subkey, "insteadof")) {
			rewrite = make_rewrite(&rewrites, name, namelen);
369 370 371
			if (!value)
				return config_error_nonbool(key);
			add_instead_of(rewrite, xstrdup(value));
T
Thomas Gummerer 已提交
372 373
		} else if (!strcmp(subkey, "pushinsteadof")) {
			rewrite = make_rewrite(&rewrites_push, name, namelen);
374 375 376 377 378
			if (!value)
				return config_error_nonbool(key);
			add_instead_of(rewrite, xstrdup(value));
		}
	}
379

T
Thomas Gummerer 已提交
380
	if (parse_config_key(key, "remote", &name, &namelen, &subkey) < 0)
381
		return 0;
382 383

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

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

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

481 482
static void read_config(void)
{
483
	static int loaded;
484
	int flag;
485 486

	if (loaded)
487
		return;
488 489
	loaded = 1;

490
	current_branch = NULL;
491
	if (startup_info->have_repository) {
492
		const char *head_ref = resolve_ref_unsafe("HEAD", 0, NULL, &flag);
493 494 495 496
		if (head_ref && (flag & REF_ISSYMREF) &&
		    skip_prefix(head_ref, "refs/heads/", &head_ref)) {
			current_branch = make_branch(head_ref, 0);
		}
497
	}
498
	git_config(handle_config, NULL);
499
	alias_all_urls();
500 501
}

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

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

B
Benjamin Kramer 已提交
513
		is_glob = 0;
514 515 516

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

		rhs = strrchr(lhs, ':');
522 523 524

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

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

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

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

		if (fetch) {
552
			struct object_id unused;
553

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

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

621 622 623 624
int valid_fetch_refspec(const char *fetch_refspec_str)
{
	struct refspec *refspec;

625
	refspec = parse_refspec_internal(1, &fetch_refspec_str, 1, 1);
626
	free_refspec(1, refspec);
627 628 629
	return !!refspec;
}

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

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

640 641 642
void free_refspec(int nr_refspec, struct refspec *refspec)
{
	int i;
643 644 645 646

	if (!refspec)
		return;

647 648 649 650 651 652 653
	for (i = 0; i < nr_refspec; i++) {
		free(refspec[i].src);
		free(refspec[i].dst);
	}
	free(refspec);
}

654 655
static int valid_remote_nick(const char *name)
{
656
	if (!name[0] || is_dot_or_dotdot(name))
657
		return 0;
658 659 660 661 662 663

	/* remote nicknames cannot contain slashes */
	while (*name)
		if (is_dir_sep(*name++))
			return 0;
	return 1;
664 665
}

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

678 679 680 681 682 683 684 685 686 687 688 689 690 691 692
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);
}

693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722
const char *remote_ref_for_branch(struct branch *branch, int for_push,
				  int *explicit)
{
	if (branch) {
		if (!for_push) {
			if (branch->merge_nr) {
				if (explicit)
					*explicit = 1;
				return branch->merge_name[0];
			}
		} else {
			const char *dst, *remote_name =
				pushremote_for_branch(branch, NULL);
			struct remote *remote = remote_get(remote_name);

			if (remote && remote->push_refspec_nr &&
			    (dst = apply_refspecs(remote->push,
						  remote->push_refspec_nr,
						  branch->refname))) {
				if (explicit)
					*explicit = 1;
				return dst;
			}
		}
	}
	if (explicit)
		*explicit = 0;
	return "";
}

723 724
static struct remote *remote_get_1(const char *name,
				   const char *(*get_default)(struct branch *, int *))
725 726
{
	struct remote *ret;
727
	int name_given = 0;
728

729 730
	read_config();

731 732
	if (name)
		name_given = 1;
733 734
	else
		name = get_default(current_branch, &name_given);
735

736
	ret = make_remote(name, 0);
737
	if (valid_remote_nick(name) && have_git_dir()) {
738
		if (!valid_remote(ret))
739
			read_remotes_file(ret);
740
		if (!valid_remote(ret))
741 742
			read_branches_file(ret);
	}
743
	if (name_given && !valid_remote(ret))
744
		add_url_alias(ret, name);
745
	if (!valid_remote(ret))
746
		return NULL;
747 748
	ret->fetch = parse_fetch_refspec(ret->fetch_refspec_nr, ret->fetch_refspec);
	ret->push = parse_push_refspec(ret->push_refspec_nr, ret->push_refspec);
749 750
	return ret;
}
751

752 753
struct remote *remote_get(const char *name)
{
754
	return remote_get_1(name, remote_for_branch);
755 756 757 758
}

struct remote *pushremote_get(const char *name)
{
759
	return remote_get_1(name, pushremote_for_branch);
760 761
}

762
int remote_is_configured(struct remote *remote, int in_repo)
763
{
764 765 766 767 768
	if (!remote)
		return 0;
	if (in_repo)
		return remote->configured_in_repo;
	return !!remote->origin;
769 770
}

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

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

818
struct ref *ref_remove_duplicates(struct ref *ref_map)
819
{
820
	struct string_list refs = STRING_LIST_INIT_NODUP;
821 822
	struct ref *retval = NULL;
	struct ref **p = &retval;
823

824 825 826 827 828
	while (ref_map) {
		struct ref *ref = ref_map;

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

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

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

848
	string_list_clear(&refs, 0);
849
	return retval;
850 851
}

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

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

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

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

923 924
	if (find_src && !query->dst)
		return error("query_refspecs: need either src or dst");
925

926 927 928 929
	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;
930

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

947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965
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 已提交
966 967 968 969
static struct ref *alloc_ref_with_prefix(const char *prefix, size_t prefixlen,
		const char *name)
{
	size_t len = strlen(name);
970
	struct ref *ref = xcalloc(1, st_add4(sizeof(*ref), prefixlen, len, 1));
R
René Scharfe 已提交
971 972 973 974 975
	memcpy(ref->name, prefix, prefixlen);
	memcpy(ref->name + prefixlen, name, len);
	return ref;
}

976
struct ref *alloc_ref(const char *name)
977
{
978
	return alloc_ref_with_prefix("", 0, name);
979 980
}

J
Jeff King 已提交
981
struct ref *copy_ref(const struct ref *ref)
982
{
983 984 985 986
	struct ref *cpy;
	size_t len;
	if (!ref)
		return NULL;
987 988 989
	len = st_add3(sizeof(struct ref), strlen(ref->name), 1);
	cpy = xmalloc(len);
	memcpy(cpy, ref, len);
990
	cpy->next = NULL;
991 992
	cpy->symref = xstrdup_or_null(ref->symref);
	cpy->remote_status = xstrdup_or_null(ref->remote_status);
993 994
	cpy->peer_ref = copy_ref(ref->peer_ref);
	return cpy;
995 996
}

997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008
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;
}

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

1019 1020 1021 1022 1023
void free_refs(struct ref *ref)
{
	struct ref *next;
	while (ref) {
		next = ref->next;
1024
		free_ref(ref);
1025 1026 1027 1028
		ref = next;
	}
}

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

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

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

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

1114 1115 1116
static struct ref *alloc_delete_ref(void)
{
	struct ref *ref = alloc_ref("(delete)");
1117
	oidclr(&ref->new_oid);
1118 1119 1120
	return ref;
}

1121 1122
static int try_explicit_object_name(const char *name,
				    struct ref **match)
1123
{
1124
	struct object_id oid;
1125

1126 1127 1128 1129 1130 1131
	if (!*name) {
		if (match)
			*match = alloc_delete_ref();
		return 0;
	}

1132
	if (get_oid(name, &oid))
1133 1134 1135 1136
		return -1;

	if (match) {
		*match = alloc_ref(name);
1137
		oidcpy(&(*match)->new_oid, &oid);
1138 1139
	}
	return 0;
1140 1141
}

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

1149 1150 1151 1152
static char *guess_ref(const char *name, struct ref *peer)
{
	struct strbuf buf = STRBUF_INIT;

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

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

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

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

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

1201
	const char *dst_value = rs->dst;
1202
	char *dst_guess;
1203

1204
	if (rs->pattern || rs->matching)
1205
		return 0;
1206

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

1211
	if (!dst_value) {
1212 1213
		int flag;

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

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

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

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

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

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

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

J
Junio C Hamano 已提交
1328 1329 1330 1331 1332
struct tips {
	struct commit **tip;
	int nr, alloc;
};

1333
static void add_to_tips(struct tips *tips, const struct object_id *oid)
J
Junio C Hamano 已提交
1334 1335 1336
{
	struct commit *commit;

1337
	if (is_null_oid(oid))
J
Junio C Hamano 已提交
1338
		return;
1339
	commit = lookup_commit_reference_gently(oid, 1);
J
Junio C Hamano 已提交
1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361
	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 &&
1362
		    !is_null_oid(&ref->peer_ref->new_oid))
1363
			add_to_tips(&sent_tips, &ref->peer_ref->new_oid);
J
Junio C Hamano 已提交
1364
		else
1365
			add_to_tips(&sent_tips, &ref->old_oid);
1366
		if (starts_with(ref->name, "refs/tags/"))
J
Junio C Hamano 已提交
1367 1368 1369 1370
			string_list_append(&dst_tag, ref->name);
	}
	clear_commit_marks_many(sent_tips.nr, sent_tips.tip, TMP_MARK);

1371
	string_list_sort(&dst_tag);
J
Junio C Hamano 已提交
1372 1373 1374

	/* Collect tags they do not have. */
	for (ref = src; ref; ref = ref->next) {
1375
		if (!starts_with(ref->name, "refs/tags/"))
J
Junio C Hamano 已提交
1376 1377 1378
			continue; /* not a tag */
		if (string_list_has_string(&dst_tag, ref->name))
			continue; /* they already have it */
1379
		if (sha1_object_info(ref->new_oid.hash, NULL) != OBJ_TAG)
J
Junio C Hamano 已提交
1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398
			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;

1399
			if (is_null_oid(&ref->new_oid))
J
Junio C Hamano 已提交
1400
				continue;
1401 1402
			commit = lookup_commit_reference_gently(&ref->new_oid,
								1);
J
Junio C Hamano 已提交
1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415
			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);
1416
			oidcpy(&dst_ref->new_oid, &ref->new_oid);
J
Junio C Hamano 已提交
1417 1418 1419 1420 1421 1422 1423
			dst_ref->peer_ref = copy_ref(ref);
		}
	}
	string_list_clear(&src_tag, 0);
	free(sent_tips.tip);
}

1424 1425 1426 1427 1428 1429 1430 1431
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;
}

1432 1433 1434 1435 1436
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;

1437
	string_list_sort(ref_index);
1438 1439
}

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

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

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

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

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

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

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

1533 1534
	string_list_clear(&dst_ref_index, 0);

J
Junio C Hamano 已提交
1535 1536 1537
	if (flags & MATCH_REFS_FOLLOW_TAGS)
		add_missing_tags(src, dst, &dst_tail);

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

1565
void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
1566
			     int force_update)
1567 1568 1569 1570
{
	struct ref *ref;

	for (ref = remote_refs; ref; ref = ref->next) {
1571
		int force_ref_update = ref->force || force_update;
1572
		int reject_reason = 0;
1573

1574
		if (ref->peer_ref)
1575
			oidcpy(&ref->new_oid, &ref->peer_ref->new_oid);
1576 1577 1578
		else if (!send_mirror)
			continue;

1579
		ref->deletion = is_null_oid(&ref->new_oid);
1580
		if (!ref->deletion &&
1581
			!oidcmp(&ref->old_oid, &ref->new_oid)) {
1582 1583 1584 1585
			ref->status = REF_STATUS_UPTODATE;
			continue;
		}

C
Chris Rorvick 已提交
1586
		/*
1587 1588
		 * If the remote ref has moved and is now different
		 * from what we expect, reject any push.
1589 1590 1591 1592 1593 1594 1595
		 *
		 * 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) {
1596
			if (oidcmp(&ref->old_oid, &ref->old_oid_expect))
1597
				reject_reason = REF_STATUS_REJECT_STALE;
1598 1599 1600
			else
				/* If the ref isn't stale then force the update. */
				force_ref_update = 1;
1601 1602 1603
		}

		/*
1604 1605
		 * If the update isn't already rejected then check
		 * the usual "must fast-forward" rules.
1606
		 *
1607 1608 1609
		 * Decide whether an individual refspec A:B can be
		 * pushed.  The push will succeed if any of the
		 * following are true:
1610
		 *
C
Chris Rorvick 已提交
1611
		 * (1) the remote reference B does not exist
1612
		 *
C
Chris Rorvick 已提交
1613 1614
		 * (2) the remote reference B is being removed (i.e.,
		 *     pushing :B where no source is specified)
1615
		 *
1616 1617 1618
		 * (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.
1619
		 *
C
Chris Rorvick 已提交
1620 1621
		 * (4) it is forced using the +A:B notation, or by
		 *     passing the --force argument
1622 1623
		 */

1624
		if (!reject_reason && !ref->deletion && !is_null_oid(&ref->old_oid)) {
1625
			if (starts_with(ref->name, "refs/tags/"))
1626
				reject_reason = REF_STATUS_REJECT_ALREADY_EXISTS;
1627
			else if (!has_object_file(&ref->old_oid))
1628
				reject_reason = REF_STATUS_REJECT_FETCH_FIRST;
1629 1630
			else if (!lookup_commit_reference_gently(&ref->old_oid, 1) ||
				 !lookup_commit_reference_gently(&ref->new_oid, 1))
1631
				reject_reason = REF_STATUS_REJECT_NEEDS_FORCE;
1632
			else if (!ref_newer(&ref->new_oid, &ref->old_oid))
1633
				reject_reason = REF_STATUS_REJECT_NONFASTFORWARD;
1634
		}
1635 1636 1637 1638 1639 1640 1641 1642 1643

		/*
		 * "--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;
1644 1645 1646
	}
}

1647 1648
static void set_merge(struct branch *ret)
{
1649
	struct remote *remote;
1650
	char *ref;
1651
	struct object_id oid;
1652 1653
	int i;

1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666
	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;
	}

1667 1668
	remote = remote_get(ret->remote_name);

1669 1670 1671 1672
	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]);
1673
		if (!remote_find_tracking(remote, ret->merge[i]) ||
1674 1675 1676
		    strcmp(ret->remote_name, "."))
			continue;
		if (dwim_ref(ret->merge_name[i], strlen(ret->merge_name[i]),
1677
			     &oid, &ref) == 1)
1678 1679 1680 1681 1682 1683
			ret->merge[i]->dst = ref;
		else
			ret->merge[i]->dst = xstrdup(ret->merge_name[i]);
	}
}

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

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

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

1711
__attribute__((format (printf,2,3)))
1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726
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"));
1727 1728 1729 1730 1731 1732 1733

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

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

1747 1748 1749
	return branch->merge[0]->dst;
}

J
Jeff King 已提交
1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826
static const char *tracking_for_push_dest(struct remote *remote,
					  const char *refname,
					  struct strbuf *err)
{
	char *ret;

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

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

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

J
Jeff King 已提交
1830 1831 1832 1833 1834
	if (!branch->push_tracking_ref)
		branch->push_tracking_ref = branch_get_push_1(branch, err);
	return branch->push_tracking_ref;
}

1835 1836 1837 1838
static int ignore_symref_update(const char *refname)
{
	int flag;

1839
	if (!resolve_ref_unsafe(refname, 0, NULL, &flag))
1840 1841 1842 1843
		return 0; /* non-existing refs are OK */
	return (flag & REF_ISSYMREF);
}

1844 1845 1846 1847 1848 1849 1850
/*
 * 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.
 */
1851
static struct ref *get_expanded_map(const struct ref *remote_refs,
1852 1853
				    const struct refspec *refspec)
{
1854
	const struct ref *ref;
1855 1856 1857 1858
	struct ref *ret = NULL;
	struct ref **tail = &ret;

	for (ref = remote_refs; ref; ref = ref->next) {
1859 1860
		char *expn_name = NULL;

1861 1862
		if (strchr(ref->name, '^'))
			continue; /* a dereference item */
1863
		if (match_name_with_pattern(refspec->src, ref->name,
1864 1865
					    refspec->dst, &expn_name) &&
		    !ignore_symref_update(expn_name)) {
1866 1867
			struct ref *cpy = copy_ref(ref);

1868
			cpy->peer_ref = alloc_ref(expn_name);
1869 1870 1871 1872 1873
			if (refspec->force)
				cpy->peer_ref->force = 1;
			*tail = cpy;
			tail = &cpy->next;
		}
1874
		free(expn_name);
1875 1876 1877 1878 1879
	}

	return ret;
}

1880
static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
1881
{
1882
	const struct ref *ref;
1883
	for (ref = refs; ref; ref = ref->next) {
1884
		if (refname_match(name, ref->name))
1885 1886 1887 1888 1889
			return ref;
	}
	return NULL;
}

1890
struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
1891
{
1892
	const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
1893 1894

	if (!ref)
1895
		return NULL;
1896 1897 1898 1899 1900 1901

	return copy_ref(ref);
}

static struct ref *get_local_ref(const char *name)
{
1902
	if (!name || name[0] == '\0')
1903 1904
		return NULL;

1905
	if (starts_with(name, "refs/"))
1906
		return alloc_ref(name);
1907

1908 1909 1910
	if (starts_with(name, "heads/") ||
	    starts_with(name, "tags/") ||
	    starts_with(name, "remotes/"))
R
René Scharfe 已提交
1911
		return alloc_ref_with_prefix("refs/", 5, name);
1912

R
René Scharfe 已提交
1913
	return alloc_ref_with_prefix("refs/heads/", 11, name);
1914 1915
}

1916
int get_fetch_map(const struct ref *remote_refs,
1917
		  const struct refspec *refspec,
1918 1919
		  struct ref ***tail,
		  int missing_ok)
1920
{
D
Daniel Barkalow 已提交
1921
	struct ref *ref_map, **rmp;
1922 1923 1924 1925

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

1928 1929
		if (refspec->exact_sha1) {
			ref_map = alloc_ref(name);
1930
			get_oid_hex(name, &ref_map->old_oid);
1931 1932 1933
		} else {
			ref_map = get_remote_ref(remote_refs, name);
		}
1934 1935 1936 1937 1938 1939 1940
		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;
		}
1941 1942
	}

D
Daniel Barkalow 已提交
1943 1944
	for (rmp = &ref_map; *rmp; ) {
		if ((*rmp)->peer_ref) {
1945
			if (!starts_with((*rmp)->peer_ref->name, "refs/") ||
1946
			    check_refname_format((*rmp)->peer_ref->name, 0)) {
D
Daniel Barkalow 已提交
1947 1948 1949 1950 1951 1952 1953 1954 1955 1956
				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);
1957 1958
	}

1959 1960
	if (ref_map)
		tail_link_ref(ref_map, tail);
1961 1962 1963

	return 0;
}
1964 1965 1966 1967 1968 1969 1970

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)) {
1971
			oidcpy(&ref->old_oid, &list->old_oid);
1972 1973 1974 1975
			return 0;
		}
	return 1;
}
1976

1977 1978 1979
static void unmark_and_free(struct commit_list *list, unsigned int mark)
{
	while (list) {
1980 1981
		struct commit *commit = pop_commit(&list);
		commit->object.flags &= ~mark;
1982 1983 1984
	}
}

1985
int ref_newer(const struct object_id *new_oid, const struct object_id *old_oid)
1986 1987
{
	struct object *o;
1988
	struct commit *old_commit, *new_commit;
1989 1990 1991
	struct commit_list *list, *used;
	int found = 0;

1992
	/*
1993 1994
	 * Both new_commit and old_commit must be commit-ish and new_commit is descendant of
	 * old_commit.  Otherwise we require --force.
1995
	 */
1996
	o = deref_tag(parse_object(old_oid), NULL, 0);
1997 1998
	if (!o || o->type != OBJ_COMMIT)
		return 0;
1999
	old_commit = (struct commit *) o;
2000

2001
	o = deref_tag(parse_object(new_oid), NULL, 0);
2002 2003
	if (!o || o->type != OBJ_COMMIT)
		return 0;
2004
	new_commit = (struct commit *) o;
2005

2006
	if (parse_commit(new_commit) < 0)
2007 2008 2009
		return 0;

	used = list = NULL;
2010
	commit_list_insert(new_commit, &list);
2011
	while (list) {
2012 2013 2014
		new_commit = pop_most_recent_commit(&list, TMP_MARK);
		commit_list_insert(new_commit, &used);
		if (new_commit == old_commit) {
2015 2016 2017 2018 2019 2020 2021 2022 2023
			found = 1;
			break;
		}
	}
	unmark_and_free(list, TMP_MARK);
	unmark_and_free(used, TMP_MARK);
	return found;
}

2024
/*
2025 2026 2027 2028 2029 2030 2031 2032 2033 2034
 * Lookup the upstream branch for the given branch and if present, optionally
 * compute the commit ahead/behind values for the pair.
 *
 * If abf is AHEAD_BEHIND_FULL, compute the full ahead/behind and return the
 * counts in *num_ours and *num_theirs.  If abf is AHEAD_BEHIND_QUICK, skip
 * the (potentially expensive) a/b computation (*num_ours and *num_theirs are
 * set to zero).
 *
 * The name of the upstream branch (or NULL if no upstream is defined) is
 * returned via *upstream_name, if it is not itself NULL.
2035
 *
2036
 * Returns -1 if num_ours and num_theirs could not be filled in (e.g., no
2037 2038
 * upstream defined, or ref does not exist).  Returns 0 if the commits are
 * identical.  Returns 1 if commits are different.
2039
 */
2040
int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs,
2041
		       const char **upstream_name, enum ahead_behind_flags abf)
2042
{
2043
	struct object_id oid;
2044 2045
	struct commit *ours, *theirs;
	struct rev_info revs;
2046 2047
	const char *base;
	struct argv_array argv = ARGV_ARRAY_INIT;
2048

2049
	/* Cannot stat unless we are marked to build on top of somebody else. */
2050
	base = branch_get_upstream(branch, NULL);
2051 2052
	if (upstream_name)
		*upstream_name = base;
2053
	if (!base)
2054
		return -1;
2055

2056
	/* Cannot stat if what we used to build on no longer exists */
2057
	if (read_ref(base, &oid))
2058
		return -1;
2059
	theirs = lookup_commit_reference(&oid);
2060
	if (!theirs)
2061
		return -1;
2062

2063
	if (read_ref(branch->refname, &oid))
2064
		return -1;
2065
	ours = lookup_commit_reference(&oid);
2066
	if (!ours)
2067
		return -1;
2068

2069 2070
	*num_theirs = *num_ours = 0;

2071
	/* are we the same? */
2072
	if (theirs == ours)
2073
		return 0;
2074 2075
	if (abf == AHEAD_BEHIND_QUICK)
		return 1;
2076 2077
	if (abf != AHEAD_BEHIND_FULL)
		BUG("stat_tracking_info: invalid abf '%d'", abf);
2078

2079
	/* Run "rev-list --left-right ours...theirs" internally... */
2080 2081 2082
	argv_array_push(&argv, ""); /* ignored */
	argv_array_push(&argv, "--left-right");
	argv_array_pushf(&argv, "%s...%s",
2083 2084
			 oid_to_hex(&ours->object.oid),
			 oid_to_hex(&theirs->object.oid));
2085
	argv_array_push(&argv, "--");
2086 2087

	init_revisions(&revs, NULL);
2088
	setup_revisions(argv.argc, argv.argv, &revs, NULL);
2089 2090
	if (prepare_revision_walk(&revs))
		die("revision walk setup failed");
2091 2092 2093 2094 2095 2096 2097 2098 2099 2100 2101

	/* ... and count the commits on each side. */
	while (1) {
		struct commit *c = get_revision(&revs);
		if (!c)
			break;
		if (c->object.flags & SYMMETRIC_LEFT)
			(*num_ours)++;
		else
			(*num_theirs)++;
	}
2102 2103 2104 2105

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

	argv_array_clear(&argv);
2108
	return 1;
2109 2110 2111 2112 2113
}

/*
 * Return true when there is anything to report, otherwise false.
 */
2114 2115
int format_tracking_info(struct branch *branch, struct strbuf *sb,
			 enum ahead_behind_flags abf)
2116
{
2117
	int ours, theirs, sti;
2118
	const char *full_base;
2119
	char *base;
2120
	int upstream_is_gone = 0;
2121

2122 2123
	sti = stat_tracking_info(branch, &ours, &theirs, &full_base, abf);
	if (sti < 0) {
2124 2125
		if (!full_base)
			return 0;
2126 2127
		upstream_is_gone = 1;
	}
2128

2129
	base = shorten_unambiguous_ref(full_base, 0);
2130 2131 2132 2133 2134
	if (upstream_is_gone) {
		strbuf_addf(sb,
			_("Your branch is based on '%s', but the upstream is gone.\n"),
			base);
		if (advice_status_hints)
2135
			strbuf_addstr(sb,
2136
				_("  (use \"git branch --unset-upstream\" to fixup)\n"));
2137
	} else if (!sti) {
2138
		strbuf_addf(sb,
2139
			_("Your branch is up to date with '%s'.\n"),
2140
			base);
2141 2142 2143 2144 2145 2146 2147
	} else if (abf == AHEAD_BEHIND_QUICK) {
		strbuf_addf(sb,
			    _("Your branch and '%s' refer to different commits.\n"),
			    base);
		if (advice_status_hints)
			strbuf_addf(sb, _("  (use \"%s\" for details)\n"),
				    "git status --ahead-behind");
2148
	} else if (!theirs) {
2149 2150 2151
		strbuf_addf(sb,
			Q_("Your branch is ahead of '%s' by %d commit.\n",
			   "Your branch is ahead of '%s' by %d commits.\n",
2152 2153
			   ours),
			base, ours);
2154
		if (advice_status_hints)
2155
			strbuf_addstr(sb,
2156
				_("  (use \"git push\" to publish your local commits)\n"));
2157
	} else if (!ours) {
2158 2159 2160 2161 2162
		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",
2163 2164
			   theirs),
			base, theirs);
2165
		if (advice_status_hints)
2166
			strbuf_addstr(sb,
2167
				_("  (use \"git pull\" to update your local branch)\n"));
2168
	} else {
2169 2170 2171 2172 2173 2174 2175
		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",
2176
			   ours + theirs),
2177
			base, ours, theirs);
2178
		if (advice_status_hints)
2179
			strbuf_addstr(sb,
2180
				_("  (use \"git pull\" to merge the remote branch into yours)\n"));
2181
	}
2182
	free(base);
2183 2184
	return 1;
}
2185

2186 2187
static int one_local_ref(const char *refname, const struct object_id *oid,
			 int flag, void *cb_data)
2188 2189 2190 2191 2192
{
	struct ref ***local_tail = cb_data;
	struct ref *ref;

	/* we already know it starts with refs/ to get here */
2193
	if (check_refname_format(refname + 5, 0))
2194 2195
		return 0;

2196
	ref = alloc_ref(refname);
2197
	oidcpy(&ref->new_oid, oid);
2198 2199 2200 2201 2202 2203 2204
	**local_tail = ref;
	*local_tail = &ref->next;
	return 0;
}

struct ref *get_local_heads(void)
{
2205
	struct ref *local_refs = NULL, **local_tail = &local_refs;
2206

2207 2208 2209
	for_each_ref(one_local_ref, &local_tail);
	return local_refs;
}
J
Jay Soffian 已提交
2210

2211 2212 2213
struct ref *guess_remote_head(const struct ref *head,
			      const struct ref *refs,
			      int all)
J
Jay Soffian 已提交
2214 2215
{
	const struct ref *r;
2216 2217
	struct ref *list = NULL;
	struct ref **tail = &list;
J
Jay Soffian 已提交
2218

2219
	if (!head)
J
Jay Soffian 已提交
2220 2221
		return NULL;

2222 2223 2224 2225 2226 2227 2228 2229
	/*
	 * 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 已提交
2230
	/* If refs/heads/master could be right, it is. */
2231 2232
	if (!all) {
		r = find_ref_by_name(refs, "refs/heads/master");
2233
		if (r && !oidcmp(&r->old_oid, &head->old_oid))
2234 2235
			return copy_ref(r);
	}
J
Jay Soffian 已提交
2236 2237

	/* Look for another ref that points there */
2238
	for (r = refs; r; r = r->next) {
2239
		if (r != head &&
2240
		    starts_with(r->name, "refs/heads/") &&
2241
		    !oidcmp(&r->old_oid, &head->old_oid)) {
2242 2243 2244 2245 2246 2247
			*tail = copy_ref(r);
			tail = &((*tail)->next);
			if (!all)
				break;
		}
	}
J
Jay Soffian 已提交
2248

2249
	return list;
J
Jay Soffian 已提交
2250
}
2251 2252 2253 2254

struct stale_heads_info {
	struct string_list *ref_names;
	struct ref **stale_refs_tail;
2255 2256
	struct refspec *refs;
	int ref_count;
2257 2258
};

2259 2260
static int get_stale_heads_cb(const char *refname, const struct object_id *oid,
			      int flags, void *cb_data)
2261 2262
{
	struct stale_heads_info *info = cb_data;
2263
	struct string_list matches = STRING_LIST_INIT_DUP;
2264
	struct refspec query;
2265
	int i, stale = 1;
2266 2267 2268
	memset(&query, 0, sizeof(struct refspec));
	query.dst = (char *)refname;

2269 2270 2271
	query_refspecs_multiple(info->refs, info->ref_count, &query, &matches);
	if (matches.nr == 0)
		goto clean_exit; /* No matches */
2272 2273 2274 2275

	/*
	 * 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
2276 2277 2278
	 * remote, we consider it to be stale. In order to deal with
	 * overlapping refspecs, we need to go over all of the
	 * matching refs.
2279
	 */
2280 2281 2282 2283 2284 2285 2286 2287
	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) {
2288
		struct ref *ref = make_linked_ref(refname, &info->stale_refs_tail);
2289
		oidcpy(&ref->new_oid, oid);
2290
	}
2291

2292 2293
clean_exit:
	string_list_clear(&matches, 0);
2294 2295 2296
	return 0;
}

2297
struct ref *get_stale_heads(struct refspec *refs, int ref_count, struct ref *fetch_map)
2298 2299
{
	struct ref *ref, *stale_refs = NULL;
2300
	struct string_list ref_names = STRING_LIST_INIT_NODUP;
2301
	struct stale_heads_info info;
2302

2303 2304
	info.ref_names = &ref_names;
	info.stale_refs_tail = &stale_refs;
2305 2306
	info.refs = refs;
	info.ref_count = ref_count;
2307
	for (ref = fetch_map; ref; ref = ref->next)
2308
		string_list_append(&ref_names, ref->name);
2309
	string_list_sort(&ref_names);
2310 2311 2312 2313
	for_each_ref(get_stale_heads_cb, &info);
	string_list_clear(&ref_names, 0);
	return stale_refs;
}
2314 2315 2316 2317

/*
 * Compare-and-swap
 */
2318
static void clear_cas_option(struct push_cas_option *cas)
2319 2320 2321 2322 2323 2324 2325 2326 2327 2328 2329 2330 2331 2332 2333 2334 2335 2336 2337 2338 2339
{
	int i;

	for (i = 0; i < cas->nr; i++)
		free(cas->entry[i].refname);
	free(cas->entry);
	memset(cas, 0, sizeof(*cas));
}

static struct push_cas *add_cas_entry(struct push_cas_option *cas,
				      const char *refname,
				      size_t refnamelen)
{
	struct push_cas *entry;
	ALLOC_GROW(cas->entry, cas->nr + 1, cas->alloc);
	entry = &cas->entry[cas->nr++];
	memset(entry, 0, sizeof(*entry));
	entry->refname = xmemdupz(refname, refnamelen);
	return entry;
}

2340
static int parse_push_cas_option(struct push_cas_option *cas, const char *arg, int unset)
2341 2342 2343 2344 2345 2346 2347 2348 2349 2350 2351 2352 2353 2354 2355 2356 2357 2358 2359 2360 2361
{
	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;
2362
	else if (!colon[1])
2363 2364
		oidclr(&entry->expect);
	else if (get_oid(colon + 1, &entry->expect))
2365 2366 2367 2368 2369 2370 2371 2372
		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);
}
2373 2374 2375 2376 2377 2378 2379 2380 2381 2382 2383 2384 2385

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,
2386
			   struct object_id *oid)
2387 2388 2389 2390 2391 2392
{
	char *dst;

	dst = apply_refspecs(remote->fetch, remote->fetch_refspec_nr, refname);
	if (!dst)
		return -1; /* no tracking ref for refname at remote */
2393
	if (read_ref(dst, oid))
2394 2395 2396 2397 2398 2399 2400 2401 2402 2403 2404 2405 2406
		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];
2407
		if (!refname_match(entry->refname, ref->name))
2408 2409 2410
			continue;
		ref->expect_old_sha1 = 1;
		if (!entry->use_tracking)
2411
			oidcpy(&ref->old_oid_expect, &entry->expect);
2412
		else if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
2413
			oidclr(&ref->old_oid_expect);
2414 2415 2416 2417 2418 2419 2420 2421
		return;
	}

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

	ref->expect_old_sha1 = 1;
2422
	if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
2423
		oidclr(&ref->old_oid_expect);
2424 2425 2426 2427 2428 2429 2430 2431 2432 2433
}

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