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

F
Felipe Contreras 已提交
16 17
enum map_direction { FROM_SRC, FROM_DST };

18 19 20 21
struct counted_string {
	size_t len;
	const char *s;
};
22 23
struct rewrite {
	const char *base;
24 25
	size_t baselen;
	struct counted_string *instead_of;
26 27 28
	int instead_of_nr;
	int instead_of_alloc;
};
29 30 31 32 33
struct rewrites {
	struct rewrite **rewrite;
	int rewrite_alloc;
	int rewrite_nr;
};
34

35
static struct remote **remotes;
D
Daniel Barkalow 已提交
36 37
static int remotes_alloc;
static int remotes_nr;
38
static struct hashmap remotes_hash;
39

40
static struct branch **branches;
D
Daniel Barkalow 已提交
41 42
static int branches_alloc;
static int branches_nr;
43 44

static struct branch *current_branch;
45
static const char *pushremote_name;
46

47
static struct rewrites rewrites;
48
static struct rewrites rewrites_push;
49

50 51
static int valid_remote(const struct remote *remote)
{
52
	return (!!remote->url) || (!!remote->foreign_vcs);
53 54
}

55
static const char *alias_url(const char *url, struct rewrites *r)
56 57
{
	int i, j;
58 59 60 61 62
	struct counted_string *longest;
	int longest_i;

	longest = NULL;
	longest_i = -1;
63 64
	for (i = 0; i < r->rewrite_nr; i++) {
		if (!r->rewrite[i])
65
			continue;
66
		for (j = 0; j < r->rewrite[i]->instead_of_nr; j++) {
67
			if (starts_with(url, r->rewrite[i]->instead_of[j].s) &&
68
			    (!longest ||
69 70
			     longest->len < r->rewrite[i]->instead_of[j].len)) {
				longest = &(r->rewrite[i]->instead_of[j]);
71
				longest_i = i;
72 73 74
			}
		}
	}
75 76 77
	if (!longest)
		return url;

78
	return xstrfmt("%s%s", r->rewrite[longest_i]->base, url + longest->len);
79 80
}

81
static void add_url(struct remote *remote, const char *url)
82
{
D
Daniel Barkalow 已提交
83 84
	ALLOC_GROW(remote->url, remote->url_nr + 1, remote->url_alloc);
	remote->url[remote->url_nr++] = url;
85 86
}

87 88 89 90 91 92
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;
}

93 94 95 96 97 98 99 100 101 102 103 104 105
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);
}

106 107 108 109 110
struct remotes_hash_key {
	const char *str;
	int len;
};

111
static int remotes_hash_cmp(const void *unused_cmp_data,
112 113 114
			    const void *entry,
			    const void *entry_or_key,
			    const void *keydata)
115
{
116 117 118 119
	const struct remote *a = entry;
	const struct remote *b = entry_or_key;
	const struct remotes_hash_key *key = keydata;

120 121 122 123 124 125 126 127 128
	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)
129
		hashmap_init(&remotes_hash, remotes_hash_cmp, NULL, 0);
130 131
}

132 133
static struct remote *make_remote(const char *name, int len)
{
134 135 136
	struct remote *ret, *replaced;
	struct remotes_hash_key lookup;
	struct hashmap_entry lookup_entry;
137

138 139 140 141 142 143 144 145 146 147
	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;
148

D
Daniel Barkalow 已提交
149
	ret = xcalloc(1, sizeof(struct remote));
150
	ret->prune = -1;  /* unspecified */
151
	ret->prune_tags = -1;  /* unspecified */
152 153
	ret->name = xstrndup(name, len);
	refspec_init(&ret->push, REFSPEC_PUSH);
154
	refspec_init(&ret->fetch, REFSPEC_FETCH);
155

D
Daniel Barkalow 已提交
156 157
	ALLOC_GROW(remotes, remotes_nr + 1, remotes_alloc);
	remotes[remotes_nr++] = ret;
158 159 160 161

	hashmap_entry_init(ret, lookup_entry.hash);
	replaced = hashmap_put(&remotes_hash, ret);
	assert(replaced == NULL);  /* no previous entry overwritten */
D
Daniel Barkalow 已提交
162
	return ret;
163 164
}

165 166
static void add_merge(struct branch *branch, const char *name)
{
D
Daniel Barkalow 已提交
167 168 169
	ALLOC_GROW(branch->merge_name, branch->merge_nr + 1,
		   branch->merge_alloc);
	branch->merge_name[branch->merge_nr++] = name;
170 171 172 173
}

static struct branch *make_branch(const char *name, int len)
{
D
Daniel Barkalow 已提交
174 175
	struct branch *ret;
	int i;
176

D
Daniel Barkalow 已提交
177 178 179 180 181
	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];
182 183
	}

D
Daniel Barkalow 已提交
184 185 186
	ALLOC_GROW(branches, branches_nr + 1, branches_alloc);
	ret = xcalloc(1, sizeof(struct branch));
	branches[branches_nr++] = ret;
187
	if (len)
D
Daniel Barkalow 已提交
188
		ret->name = xstrndup(name, len);
189
	else
D
Daniel Barkalow 已提交
190
		ret->name = xstrdup(name);
191
	ret->refname = xstrfmt("refs/heads/%s", ret->name);
192

D
Daniel Barkalow 已提交
193
	return ret;
194 195
}

196
static struct rewrite *make_rewrite(struct rewrites *r, const char *base, int len)
197 198 199 200
{
	struct rewrite *ret;
	int i;

201
	for (i = 0; i < r->rewrite_nr; i++) {
202
		if (len
203 204 205 206
		    ? (len == r->rewrite[i]->baselen &&
		       !strncmp(base, r->rewrite[i]->base, len))
		    : !strcmp(base, r->rewrite[i]->base))
			return r->rewrite[i];
207 208
	}

209
	ALLOC_GROW(r->rewrite, r->rewrite_nr + 1, r->rewrite_alloc);
210
	ret = xcalloc(1, sizeof(struct rewrite));
211
	r->rewrite[r->rewrite_nr++] = ret;
212
	if (len) {
213
		ret->base = xstrndup(base, len);
214 215 216
		ret->baselen = len;
	}
	else {
217
		ret->base = xstrdup(base);
218 219
		ret->baselen = strlen(base);
	}
220 221 222 223 224 225
	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);
226 227 228
	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++;
229 230
}

231 232 233 234 235 236 237
static const char *skip_spaces(const char *s)
{
	while (isspace(*s))
		s++;
	return s;
}

238 239
static void read_remotes_file(struct remote *remote)
{
240
	struct strbuf buf = STRBUF_INIT;
241
	FILE *f = fopen_or_warn(git_path("remotes/%s", remote->name), "r");
242 243 244

	if (!f)
		return;
245
	remote->configured_in_repo = 1;
246
	remote->origin = REMOTE_REMOTES;
247
	while (strbuf_getline(&buf, f) != EOF) {
248
		const char *v;
249

250
		strbuf_rtrim(&buf);
251

252 253 254
		if (skip_prefix(buf.buf, "URL:", &v))
			add_url_alias(remote, xstrdup(skip_spaces(v)));
		else if (skip_prefix(buf.buf, "Push:", &v))
255
			refspec_append(&remote->push, skip_spaces(v));
256
		else if (skip_prefix(buf.buf, "Pull:", &v))
257
			refspec_append(&remote->fetch, skip_spaces(v));
258
	}
259
	strbuf_release(&buf);
260 261 262 263 264
	fclose(f);
}

static void read_branches_file(struct remote *remote)
{
265
	char *frag;
266
	struct strbuf buf = STRBUF_INIT;
267
	FILE *f = fopen_or_warn(git_path("branches/%s", remote->name), "r");
268 269 270

	if (!f)
		return;
271

272
	strbuf_getline_lf(&buf, f);
273
	fclose(f);
274 275 276
	strbuf_trim(&buf);
	if (!buf.len) {
		strbuf_release(&buf);
277
		return;
278 279
	}

280
	remote->configured_in_repo = 1;
281
	remote->origin = REMOTE_BRANCHES;
282 283

	/*
284
	 * The branches file would have URL and optionally
285
	 * #branch specified.  The "master" (or specified) branch is
286 287
	 * fetched and stored in the local branch matching the
	 * remote name.
288
	 */
289 290
	frag = strchr(buf.buf, '#');
	if (frag)
291
		*(frag++) = '\0';
292 293 294 295
	else
		frag = "master";

	add_url_alias(remote, strbuf_detach(&buf, NULL));
296 297 298
	strbuf_addf(&buf, "refs/heads/%s:refs/heads/%s",
		    frag, remote->name);
	refspec_append(&remote->fetch, buf.buf);
299

300 301 302 303
	/*
	 * Cogito compatible push: push current HEAD to remote #branch
	 * (master if missing)
	 */
304
	strbuf_reset(&buf);
305 306
	strbuf_addf(&buf, "HEAD:refs/heads/%s", frag);
	refspec_append(&remote->push, buf.buf);
307
	remote->fetch_tags = 1; /* always auto-follow */
308
	strbuf_release(&buf);
309 310
}

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

T
Thomas Gummerer 已提交
350
	if (parse_config_key(key, "remote", &name, &namelen, &subkey) < 0)
351
		return 0;
352 353

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

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

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

453 454
static void read_config(void)
{
455
	static int loaded;
456
	int flag;
457 458

	if (loaded)
459
		return;
460 461
	loaded = 1;

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

474 475
static int valid_remote_nick(const char *name)
{
476
	if (!name[0] || is_dot_or_dotdot(name))
477
		return 0;
478 479 480 481 482 483

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

486 487 488 489 490 491 492 493 494 495 496 497
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";
}

498 499 500 501 502 503 504 505 506 507 508 509 510 511 512
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);
}

513 514 515 516 517 518 519 520 521 522 523 524 525 526 527
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);

528
			if (remote && remote->push.nr &&
529
			    (dst = apply_refspecs(&remote->push,
530 531 532 533 534 535 536 537 538 539 540 541
						  branch->refname))) {
				if (explicit)
					*explicit = 1;
				return dst;
			}
		}
	}
	if (explicit)
		*explicit = 0;
	return "";
}

542 543
static struct remote *remote_get_1(const char *name,
				   const char *(*get_default)(struct branch *, int *))
544 545
{
	struct remote *ret;
546
	int name_given = 0;
547

548 549
	read_config();

550 551
	if (name)
		name_given = 1;
552 553
	else
		name = get_default(current_branch, &name_given);
554

555
	ret = make_remote(name, 0);
556
	if (valid_remote_nick(name) && have_git_dir()) {
557
		if (!valid_remote(ret))
558
			read_remotes_file(ret);
559
		if (!valid_remote(ret))
560 561
			read_branches_file(ret);
	}
562
	if (name_given && !valid_remote(ret))
563
		add_url_alias(ret, name);
564
	if (!valid_remote(ret))
565 566 567
		return NULL;
	return ret;
}
568

569 570
struct remote *remote_get(const char *name)
{
571
	return remote_get_1(name, remote_for_branch);
572 573 574 575
}

struct remote *pushremote_get(const char *name)
{
576
	return remote_get_1(name, pushremote_for_branch);
577 578
}

579
int remote_is_configured(struct remote *remote, int in_repo)
580
{
581 582 583 584 585
	if (!remote)
		return 0;
	if (in_repo)
		return remote->configured_in_repo;
	return !!remote->origin;
586 587
}

588 589 590 591
int for_each_remote(each_remote_fn fn, void *priv)
{
	int i, result = 0;
	read_config();
D
Daniel Barkalow 已提交
592
	for (i = 0; i < remotes_nr && !result; i++) {
593 594 595 596 597 598 599 600
		struct remote *r = remotes[i];
		if (!r)
			continue;
		result = fn(r, priv);
	}
	return result;
}

601 602
static void handle_duplicate(struct ref *ref1, struct ref *ref2)
{
603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624
	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"));
		}
	}
625 626 627 628
	free(ref2->peer_ref);
	free(ref2);
}

629
struct ref *ref_remove_duplicates(struct ref *ref_map)
630
{
631
	struct string_list refs = STRING_LIST_INIT_NODUP;
632 633
	struct ref *retval = NULL;
	struct ref **p = &retval;
634

635 636 637 638 639
	while (ref_map) {
		struct ref *ref = ref_map;

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

641 642 643
		if (!ref->peer_ref) {
			*p = ref;
			p = &ref->next;
644
		} else {
645 646 647 648 649
			struct string_list_item *item =
				string_list_insert(&refs, ref->peer_ref->name);

			if (item->util) {
				/* Entry already existed */
650
				handle_duplicate((struct ref *)item->util, ref);
651 652 653 654 655
			} else {
				*p = ref;
				p = &ref->next;
				item->util = ref;
			}
656 657
		}
	}
658

659
	string_list_clear(&refs, 0);
660
	return retval;
661 662
}

663
int remote_has_url(struct remote *remote, const char *url)
664 665
{
	int i;
666 667
	for (i = 0; i < remote->url_nr; i++) {
		if (!strcmp(remote->url[i], url))
668 669 670 671 672
			return 1;
	}
	return 0;
}

673 674
static int match_name_with_pattern(const char *key, const char *name,
				   const char *value, char **result)
675
{
D
Daniel Barkalow 已提交
676 677
	const char *kstar = strchr(key, '*');
	size_t klen;
678 679
	size_t ksuffixlen;
	size_t namelen;
D
Daniel Barkalow 已提交
680 681 682 683
	int ret;
	if (!kstar)
		die("Key '%s' of pattern had no '*'", key);
	klen = kstar - key;
684 685 686 687
	ksuffixlen = strlen(kstar + 1);
	namelen = strlen(name);
	ret = !strncmp(name, key, klen) && namelen >= klen + ksuffixlen &&
		!memcmp(name + namelen - ksuffixlen, kstar + 1, ksuffixlen);
688
	if (ret && value) {
689
		struct strbuf sb = STRBUF_INIT;
D
Daniel Barkalow 已提交
690 691 692
		const char *vstar = strchr(value, '*');
		if (!vstar)
			die("Value '%s' of pattern has no '*'", value);
693 694 695 696
		strbuf_add(&sb, value, vstar - value);
		strbuf_add(&sb, name + klen, namelen - klen - ksuffixlen);
		strbuf_addstr(&sb, vstar + 1);
		*result = strbuf_detach(&sb, NULL);
697
	}
698 699 700
	return ret;
}

701 702 703
static void query_refspecs_multiple(struct refspec *rs,
				    struct refspec_item *query,
				    struct string_list *results)
704 705 706 707 708 709 710
{
	int i;
	int find_src = !query->src;

	if (find_src && !query->dst)
		error("query_refspecs_multiple: need either src or dst");

711 712
	for (i = 0; i < rs->nr; i++) {
		struct refspec_item *refspec = &rs->items[i];
713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728
		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);
		}
	}
}

729
int query_refspecs(struct refspec *rs, struct refspec_item *query)
730 731
{
	int i;
732
	int find_src = !query->src;
733 734
	const char *needle = find_src ? query->dst : query->src;
	char **result = find_src ? &query->src : &query->dst;
735

736 737
	if (find_src && !query->dst)
		return error("query_refspecs: need either src or dst");
738

739 740
	for (i = 0; i < rs->nr; i++) {
		struct refspec_item *refspec = &rs->items[i];
741 742
		const char *key = find_src ? refspec->dst : refspec->src;
		const char *value = find_src ? refspec->src : refspec->dst;
743

744
		if (!refspec->dst)
745
			continue;
746
		if (refspec->pattern) {
747
			if (match_name_with_pattern(key, needle, value, result)) {
748
				query->force = refspec->force;
749 750
				return 0;
			}
751 752
		} else if (!strcmp(needle, key)) {
			*result = xstrdup(value);
753
			query->force = refspec->force;
754
			return 0;
755 756 757 758 759
		}
	}
	return -1;
}

760
char *apply_refspecs(struct refspec *rs, const char *name)
761
{
762
	struct refspec_item query;
763

764
	memset(&query, 0, sizeof(struct refspec_item));
765 766
	query.src = (char *)name;

767
	if (query_refspecs(rs, &query))
768 769 770 771 772
		return NULL;

	return query.dst;
}

773
int remote_find_tracking(struct remote *remote, struct refspec_item *refspec)
774
{
775
	return query_refspecs(&remote->fetch, refspec);
776 777
}

R
René Scharfe 已提交
778 779 780 781
static struct ref *alloc_ref_with_prefix(const char *prefix, size_t prefixlen,
		const char *name)
{
	size_t len = strlen(name);
782
	struct ref *ref = xcalloc(1, st_add4(sizeof(*ref), prefixlen, len, 1));
R
René Scharfe 已提交
783 784 785 786 787
	memcpy(ref->name, prefix, prefixlen);
	memcpy(ref->name + prefixlen, name, len);
	return ref;
}

788
struct ref *alloc_ref(const char *name)
789
{
790
	return alloc_ref_with_prefix("", 0, name);
791 792
}

J
Jeff King 已提交
793
struct ref *copy_ref(const struct ref *ref)
794
{
795 796 797 798
	struct ref *cpy;
	size_t len;
	if (!ref)
		return NULL;
799 800 801
	len = st_add3(sizeof(struct ref), strlen(ref->name), 1);
	cpy = xmalloc(len);
	memcpy(cpy, ref, len);
802
	cpy->next = NULL;
803 804
	cpy->symref = xstrdup_or_null(ref->symref);
	cpy->remote_status = xstrdup_or_null(ref->remote_status);
805 806
	cpy->peer_ref = copy_ref(ref->peer_ref);
	return cpy;
807 808
}

809 810 811 812 813 814 815 816 817 818 819 820
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;
}

821
static void free_ref(struct ref *ref)
822 823 824
{
	if (!ref)
		return;
825
	free_ref(ref->peer_ref);
826 827 828 829 830
	free(ref->remote_status);
	free(ref->symref);
	free(ref);
}

831 832 833 834 835
void free_refs(struct ref *ref)
{
	struct ref *next;
	while (ref) {
		next = ref->next;
836
		free_ref(ref);
837 838 839 840
		ref = next;
	}
}

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

862 863 864
int count_refspec_match(const char *pattern,
			struct ref *refs,
			struct ref **matched_ref)
865 866 867 868 869 870 871 872 873 874 875
{
	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);

876
		if (!refname_match(pattern, name))
877 878 879 880 881 882 883 884 885 886 887 888
			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 &&
889 890
		    !starts_with(name, "refs/heads/") &&
		    !starts_with(name, "refs/tags/")) {
891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906
			/* 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) {
907 908
		if (matched_ref)
			*matched_ref = matched_weak;
909 910 911
		return weak_match;
	}
	else {
912 913
		if (matched_ref)
			*matched_ref = matched;
914 915 916 917
		return match;
	}
}

918
static void tail_link_ref(struct ref *ref, struct ref ***tail)
919 920
{
	**tail = ref;
921 922
	while (ref->next)
		ref = ref->next;
923 924 925
	*tail = &ref->next;
}

926 927 928
static struct ref *alloc_delete_ref(void)
{
	struct ref *ref = alloc_ref("(delete)");
929
	oidclr(&ref->new_oid);
930 931 932
	return ref;
}

933 934
static int try_explicit_object_name(const char *name,
				    struct ref **match)
935
{
936
	struct object_id oid;
937

938 939 940 941 942 943
	if (!*name) {
		if (match)
			*match = alloc_delete_ref();
		return 0;
	}

944
	if (get_oid(name, &oid))
945 946 947 948
		return -1;

	if (match) {
		*match = alloc_ref(name);
949
		oidcpy(&(*match)->new_oid, &oid);
950 951
	}
	return 0;
952 953
}

954
static struct ref *make_linked_ref(const char *name, struct ref ***tail)
955
{
956
	struct ref *ret = alloc_ref(name);
957 958
	tail_link_ref(ret, tail);
	return ret;
959
}
960

961 962 963 964
static char *guess_ref(const char *name, struct ref *peer)
{
	struct strbuf buf = STRBUF_INIT;

965
	const char *r = resolve_ref_unsafe(peer->name, RESOLVE_REF_READING,
966
					   NULL, NULL);
967 968 969
	if (!r)
		return NULL;

970
	if (starts_with(r, "refs/heads/"))
971
		strbuf_addstr(&buf, "refs/heads/");
972
	else if (starts_with(r, "refs/tags/"))
973 974 975 976 977 978 979 980
		strbuf_addstr(&buf, "refs/tags/");
	else
		return NULL;

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

981
static int match_explicit_lhs(struct ref *src,
982
			      struct refspec_item *rs,
983 984 985 986 987
			      struct ref **match,
			      int *allocated_match)
{
	switch (count_refspec_match(rs->src, src, match)) {
	case 1:
988 989
		if (allocated_match)
			*allocated_match = 0;
990 991 992 993 994 995
		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.
		 */
996
		if (try_explicit_object_name(rs->src, match) < 0)
997
			return error("src refspec %s does not match any.", rs->src);
998 999
		if (allocated_match)
			*allocated_match = 1;
1000 1001 1002 1003 1004 1005
		return 0;
	default:
		return error("src refspec %s matches more than one.", rs->src);
	}
}

1006 1007
static int match_explicit(struct ref *src, struct ref *dst,
			  struct ref ***dst_tail,
1008
			  struct refspec_item *rs)
1009
{
1010
	struct ref *matched_src, *matched_dst;
1011
	int allocated_src;
1012

1013
	const char *dst_value = rs->dst;
1014
	char *dst_guess;
1015

1016
	if (rs->pattern || rs->matching)
1017
		return 0;
1018

1019
	matched_src = matched_dst = NULL;
1020 1021
	if (match_explicit_lhs(src, rs, &matched_src, &allocated_src) < 0)
		return -1;
1022

1023
	if (!dst_value) {
1024 1025
		int flag;

1026 1027
		dst_value = resolve_ref_unsafe(matched_src->name,
					       RESOLVE_REF_READING,
1028
					       NULL, &flag);
1029 1030
		if (!dst_value ||
		    ((flag & REF_ISSYMREF) &&
1031
		     !starts_with(dst_value, "refs/heads/")))
1032 1033
			die("%s cannot be resolved to branch.",
			    matched_src->name);
1034
	}
1035

1036 1037 1038 1039
	switch (count_refspec_match(dst_value, dst, &matched_dst)) {
	case 1:
		break;
	case 0:
1040
		if (starts_with(dst_value, "refs/"))
1041
			matched_dst = make_linked_ref(dst_value, dst_tail);
1042
		else if (is_null_oid(&matched_src->new_oid))
1043 1044
			error("unable to delete '%s': remote ref does not exist",
			      dst_value);
1045
		else if ((dst_guess = guess_ref(dst_value, matched_src))) {
1046
			matched_dst = make_linked_ref(dst_guess, dst_tail);
1047 1048
			free(dst_guess);
		} else
1049 1050 1051 1052 1053 1054
			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);
1055 1056
		break;
	default:
1057
		matched_dst = NULL;
1058 1059 1060 1061
		error("dst refspec %s matches more than one.",
		      dst_value);
		break;
	}
1062 1063 1064 1065
	if (!matched_dst)
		return -1;
	if (matched_dst->peer_ref)
		return error("dst ref %s receives from more than one src.",
1066 1067
		      matched_dst->name);
	else {
1068 1069 1070
		matched_dst->peer_ref = allocated_src ?
					matched_src :
					copy_ref(matched_src);
1071
		matched_dst->force = rs->force;
1072
	}
1073
	return 0;
1074 1075 1076
}

static int match_explicit_refs(struct ref *src, struct ref *dst,
1077
			       struct ref ***dst_tail, struct refspec *rs)
1078 1079
{
	int i, errs;
1080 1081
	for (i = errs = 0; i < rs->nr; i++)
		errs += match_explicit(src, dst, dst_tail, &rs->items[i]);
1082
	return errs;
1083 1084
}

1085 1086 1087
static char *get_ref_match(const struct refspec *rs, const struct ref *ref,
			   int send_mirror, int direction,
			   const struct refspec_item **ret_pat)
1088
{
1089
	const struct refspec_item *pat;
1090
	char *name;
1091
	int i;
1092
	int matching_refs = -1;
1093 1094 1095 1096
	for (i = 0; i < rs->nr; i++) {
		const struct refspec_item *item = &rs->items[i];
		if (item->matching &&
		    (matching_refs == -1 || item->force)) {
1097 1098 1099 1100
			matching_refs = i;
			continue;
		}

1101 1102
		if (item->pattern) {
			const char *dst_side = item->dst ? item->dst : item->src;
F
Felipe Contreras 已提交
1103 1104
			int match;
			if (direction == FROM_SRC)
1105
				match = match_name_with_pattern(item->src, ref->name, dst_side, &name);
F
Felipe Contreras 已提交
1106
			else
1107
				match = match_name_with_pattern(dst_side, ref->name, item->src, &name);
F
Felipe Contreras 已提交
1108
			if (match) {
1109 1110 1111 1112
				matching_refs = i;
				break;
			}
		}
1113
	}
1114
	if (matching_refs == -1)
1115
		return NULL;
1116

1117
	pat = &rs->items[matching_refs];
1118 1119 1120 1121 1122 1123
	if (pat->matching) {
		/*
		 * "matching refs"; traditionally we pushed everything
		 * including refs outside refs/heads/ hierarchy, but
		 * that does not make much sense these days.
		 */
1124
		if (!send_mirror && !starts_with(ref->name, "refs/heads/"))
1125 1126 1127 1128 1129 1130
			return NULL;
		name = xstrdup(ref->name);
	}
	if (ret_pat)
		*ret_pat = pat;
	return name;
1131 1132
}

1133 1134 1135 1136 1137 1138 1139 1140
static struct ref **tail_ref(struct ref **head)
{
	struct ref **tail = head;
	while (*tail)
		tail = &((*tail)->next);
	return tail;
}

J
Junio C Hamano 已提交
1141 1142 1143 1144 1145
struct tips {
	struct commit **tip;
	int nr, alloc;
};

1146
static void add_to_tips(struct tips *tips, const struct object_id *oid)
J
Junio C Hamano 已提交
1147 1148 1149
{
	struct commit *commit;

1150
	if (is_null_oid(oid))
J
Junio C Hamano 已提交
1151
		return;
1152
	commit = lookup_commit_reference_gently(oid, 1);
J
Junio C Hamano 已提交
1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174
	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 &&
1175
		    !is_null_oid(&ref->peer_ref->new_oid))
1176
			add_to_tips(&sent_tips, &ref->peer_ref->new_oid);
J
Junio C Hamano 已提交
1177
		else
1178
			add_to_tips(&sent_tips, &ref->old_oid);
1179
		if (starts_with(ref->name, "refs/tags/"))
J
Junio C Hamano 已提交
1180 1181 1182 1183
			string_list_append(&dst_tag, ref->name);
	}
	clear_commit_marks_many(sent_tips.nr, sent_tips.tip, TMP_MARK);

1184
	string_list_sort(&dst_tag);
J
Junio C Hamano 已提交
1185 1186 1187

	/* Collect tags they do not have. */
	for (ref = src; ref; ref = ref->next) {
1188
		if (!starts_with(ref->name, "refs/tags/"))
J
Junio C Hamano 已提交
1189 1190 1191
			continue; /* not a tag */
		if (string_list_has_string(&dst_tag, ref->name))
			continue; /* they already have it */
1192
		if (oid_object_info(the_repository, &ref->new_oid, NULL) != OBJ_TAG)
J
Junio C Hamano 已提交
1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211
			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;

1212
			if (is_null_oid(&ref->new_oid))
J
Junio C Hamano 已提交
1213
				continue;
1214 1215
			commit = lookup_commit_reference_gently(&ref->new_oid,
								1);
J
Junio C Hamano 已提交
1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228
			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);
1229
			oidcpy(&dst_ref->new_oid, &ref->new_oid);
J
Junio C Hamano 已提交
1230 1231 1232 1233 1234 1235 1236
			dst_ref->peer_ref = copy_ref(ref);
		}
	}
	string_list_clear(&src_tag, 0);
	free(sent_tips.tip);
}

1237 1238 1239 1240 1241 1242 1243 1244
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;
}

1245 1246 1247 1248 1249
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;

1250
	string_list_sort(ref_index);
1251 1252
}

1253 1254 1255 1256 1257 1258
/*
 * 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.
 */
1259
int check_push_refs(struct ref *src, struct refspec *rs)
1260 1261 1262 1263
{
	int ret = 0;
	int i;

1264 1265
	for (i = 0; i < rs->nr; i++) {
		struct refspec_item *item = &rs->items[i];
1266

1267
		if (item->pattern || item->matching)
1268 1269
			continue;

1270
		ret |= match_explicit_lhs(src, item, NULL, NULL);
1271 1272 1273 1274 1275
	}

	return ret;
}

1276
/*
1277 1278 1279 1280 1281 1282
 * 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).
1283
 */
1284
int match_push_refs(struct ref *src, struct ref **dst,
1285
		    struct refspec *rs, int flags)
1286
{
A
Andy Whitcroft 已提交
1287 1288
	int send_all = flags & MATCH_REFS_ALL;
	int send_mirror = flags & MATCH_REFS_MIRROR;
F
Felipe Contreras 已提交
1289
	int send_prune = flags & MATCH_REFS_PRUNE;
1290
	int errs;
1291
	struct ref *ref, **dst_tail = tail_ref(dst);
1292
	struct string_list dst_ref_index = STRING_LIST_INIT_NODUP;
1293

1294 1295 1296 1297 1298
	/* If no refspec is provided, use the default ":" */
	if (!rs->nr)
		refspec_append(rs, ":");

	errs = match_explicit_refs(src, *dst, &dst_tail, rs);
1299 1300

	/* pick the remainder */
1301
	for (ref = src; ref; ref = ref->next) {
1302
		struct string_list_item *dst_item;
1303
		struct ref *dst_peer;
1304
		const struct refspec_item *pat = NULL;
1305
		char *dst_name;
1306

1307
		dst_name = get_ref_match(rs, ref, send_mirror, FROM_SRC, &pat);
1308
		if (!dst_name)
1309 1310
			continue;

1311 1312 1313 1314 1315
		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;
1316 1317 1318 1319 1320 1321 1322 1323 1324
		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 已提交
1325
				 * --all or --mirror.
1326 1327
				 */
				goto free_name;
A
Andy Whitcroft 已提交
1328

1329
			/* Create a new one and link it */
1330
			dst_peer = make_linked_ref(dst_name, &dst_tail);
1331
			oidcpy(&dst_peer->new_oid, &ref->new_oid);
1332 1333
			string_list_insert(&dst_ref_index,
				dst_peer->name)->util = dst_peer;
1334
		}
1335
		dst_peer->peer_ref = copy_ref(ref);
1336
		dst_peer->force = pat->force;
1337 1338
	free_name:
		free(dst_name);
1339
	}
J
Junio C Hamano 已提交
1340

1341 1342
	string_list_clear(&dst_ref_index, 0);

J
Junio C Hamano 已提交
1343 1344 1345
	if (flags & MATCH_REFS_FOLLOW_TAGS)
		add_missing_tags(src, dst, &dst_tail);

F
Felipe Contreras 已提交
1346
	if (send_prune) {
1347
		struct string_list src_ref_index = STRING_LIST_INIT_NODUP;
F
Felipe Contreras 已提交
1348 1349 1350 1351 1352 1353 1354 1355
		/* 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;

1356
			src_name = get_ref_match(rs, ref, send_mirror, FROM_DST, NULL);
F
Felipe Contreras 已提交
1357
			if (src_name) {
1358 1359 1360 1361
				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 已提交
1362 1363 1364 1365
					ref->peer_ref = alloc_delete_ref();
				free(src_name);
			}
		}
1366
		string_list_clear(&src_ref_index, 0);
F
Felipe Contreras 已提交
1367
	}
1368

1369 1370
	if (errs)
		return -1;
1371 1372
	return 0;
}
1373

1374
void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
1375
			     int force_update)
1376 1377 1378 1379
{
	struct ref *ref;

	for (ref = remote_refs; ref; ref = ref->next) {
1380
		int force_ref_update = ref->force || force_update;
1381
		int reject_reason = 0;
1382

1383
		if (ref->peer_ref)
1384
			oidcpy(&ref->new_oid, &ref->peer_ref->new_oid);
1385 1386 1387
		else if (!send_mirror)
			continue;

1388
		ref->deletion = is_null_oid(&ref->new_oid);
1389
		if (!ref->deletion &&
1390
			!oidcmp(&ref->old_oid, &ref->new_oid)) {
1391 1392 1393 1394
			ref->status = REF_STATUS_UPTODATE;
			continue;
		}

C
Chris Rorvick 已提交
1395
		/*
1396 1397
		 * If the remote ref has moved and is now different
		 * from what we expect, reject any push.
1398 1399 1400 1401 1402 1403 1404
		 *
		 * 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) {
1405
			if (oidcmp(&ref->old_oid, &ref->old_oid_expect))
1406
				reject_reason = REF_STATUS_REJECT_STALE;
1407 1408 1409
			else
				/* If the ref isn't stale then force the update. */
				force_ref_update = 1;
1410 1411 1412
		}

		/*
1413 1414
		 * If the update isn't already rejected then check
		 * the usual "must fast-forward" rules.
1415
		 *
1416 1417 1418
		 * Decide whether an individual refspec A:B can be
		 * pushed.  The push will succeed if any of the
		 * following are true:
1419
		 *
C
Chris Rorvick 已提交
1420
		 * (1) the remote reference B does not exist
1421
		 *
C
Chris Rorvick 已提交
1422 1423
		 * (2) the remote reference B is being removed (i.e.,
		 *     pushing :B where no source is specified)
1424
		 *
1425 1426 1427
		 * (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.
1428
		 *
C
Chris Rorvick 已提交
1429 1430
		 * (4) it is forced using the +A:B notation, or by
		 *     passing the --force argument
1431 1432
		 */

1433
		if (!reject_reason && !ref->deletion && !is_null_oid(&ref->old_oid)) {
1434
			if (starts_with(ref->name, "refs/tags/"))
1435
				reject_reason = REF_STATUS_REJECT_ALREADY_EXISTS;
1436
			else if (!has_object_file(&ref->old_oid))
1437
				reject_reason = REF_STATUS_REJECT_FETCH_FIRST;
1438 1439
			else if (!lookup_commit_reference_gently(&ref->old_oid, 1) ||
				 !lookup_commit_reference_gently(&ref->new_oid, 1))
1440
				reject_reason = REF_STATUS_REJECT_NEEDS_FORCE;
1441
			else if (!ref_newer(&ref->new_oid, &ref->old_oid))
1442
				reject_reason = REF_STATUS_REJECT_NONFASTFORWARD;
1443
		}
1444 1445 1446 1447 1448 1449 1450 1451 1452

		/*
		 * "--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;
1453 1454 1455
	}
}

1456 1457
static void set_merge(struct branch *ret)
{
1458
	struct remote *remote;
1459
	char *ref;
1460
	struct object_id oid;
1461 1462
	int i;

1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475
	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;
	}

1476 1477
	remote = remote_get(ret->remote_name);

1478 1479 1480 1481
	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]);
1482
		if (!remote_find_tracking(remote, ret->merge[i]) ||
1483 1484 1485
		    strcmp(ret->remote_name, "."))
			continue;
		if (dwim_ref(ret->merge_name[i], strlen(ret->merge_name[i]),
1486
			     &oid, &ref) == 1)
1487 1488 1489 1490 1491 1492
			ret->merge[i]->dst = ref;
		else
			ret->merge[i]->dst = xstrdup(ret->merge_name[i]);
	}
}

1493 1494 1495 1496 1497 1498 1499 1500 1501
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);
1502
	set_merge(ret);
1503 1504 1505 1506 1507 1508 1509 1510
	return ret;
}

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

1511 1512 1513
int branch_merge_matches(struct branch *branch,
		                 int i,
		                 const char *refname)
1514
{
1515
	if (!branch || i < 0 || i >= branch->merge_nr)
1516
		return 0;
1517
	return refname_match(branch->merge[i]->src, refname);
1518
}
1519

1520
__attribute__((format (printf,2,3)))
1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535
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"));
1536 1537 1538 1539 1540 1541 1542

	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?
		 */
1543 1544 1545
		if (!ref_exists(branch->refname))
			return error_buf(err, _("no such branch: '%s'"),
					 branch->name);
1546 1547 1548 1549 1550 1551
		return error_buf(err,
				 _("no upstream configured for branch '%s'"),
				 branch->name);
	}

	if (!branch->merge[0]->dst)
1552 1553 1554 1555
		return error_buf(err,
				 _("upstream branch '%s' not stored as a remote-tracking branch"),
				 branch->merge[0]->src);

1556 1557 1558
	return branch->merge[0]->dst;
}

J
Jeff King 已提交
1559 1560 1561 1562 1563 1564
static const char *tracking_for_push_dest(struct remote *remote,
					  const char *refname,
					  struct strbuf *err)
{
	char *ret;

1565
	ret = apply_refspecs(&remote->fetch, refname);
J
Jeff King 已提交
1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582
	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);

1583
	if (remote->push.nr) {
J
Jeff King 已提交
1584 1585 1586
		char *dst;
		const char *ret;

1587
		dst = apply_refspecs(&remote->push, branch->refname);
J
Jeff King 已提交
1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629
		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;
		}
	}

1630
	BUG("unhandled push situation");
J
Jeff King 已提交
1631 1632 1633 1634
}

const char *branch_get_push(struct branch *branch, struct strbuf *err)
{
1635 1636 1637
	if (!branch)
		return error_buf(err, _("HEAD does not point to a branch"));

J
Jeff King 已提交
1638 1639 1640 1641 1642
	if (!branch->push_tracking_ref)
		branch->push_tracking_ref = branch_get_push_1(branch, err);
	return branch->push_tracking_ref;
}

1643 1644 1645 1646
static int ignore_symref_update(const char *refname)
{
	int flag;

1647
	if (!resolve_ref_unsafe(refname, 0, NULL, &flag))
1648 1649 1650 1651
		return 0; /* non-existing refs are OK */
	return (flag & REF_ISSYMREF);
}

1652 1653 1654 1655 1656 1657 1658
/*
 * 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.
 */
1659
static struct ref *get_expanded_map(const struct ref *remote_refs,
1660
				    const struct refspec_item *refspec)
1661
{
1662
	const struct ref *ref;
1663 1664 1665 1666
	struct ref *ret = NULL;
	struct ref **tail = &ret;

	for (ref = remote_refs; ref; ref = ref->next) {
1667 1668
		char *expn_name = NULL;

1669 1670
		if (strchr(ref->name, '^'))
			continue; /* a dereference item */
1671
		if (match_name_with_pattern(refspec->src, ref->name,
1672 1673
					    refspec->dst, &expn_name) &&
		    !ignore_symref_update(expn_name)) {
1674 1675
			struct ref *cpy = copy_ref(ref);

1676
			cpy->peer_ref = alloc_ref(expn_name);
1677 1678 1679 1680 1681
			if (refspec->force)
				cpy->peer_ref->force = 1;
			*tail = cpy;
			tail = &cpy->next;
		}
1682
		free(expn_name);
1683 1684 1685 1686 1687
	}

	return ret;
}

1688
static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
1689
{
1690
	const struct ref *ref;
1691
	for (ref = refs; ref; ref = ref->next) {
1692
		if (refname_match(name, ref->name))
1693 1694 1695 1696 1697
			return ref;
	}
	return NULL;
}

1698
struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
1699
{
1700
	const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
1701 1702

	if (!ref)
1703
		return NULL;
1704 1705 1706 1707 1708 1709

	return copy_ref(ref);
}

static struct ref *get_local_ref(const char *name)
{
1710
	if (!name || name[0] == '\0')
1711 1712
		return NULL;

1713
	if (starts_with(name, "refs/"))
1714
		return alloc_ref(name);
1715

1716 1717 1718
	if (starts_with(name, "heads/") ||
	    starts_with(name, "tags/") ||
	    starts_with(name, "remotes/"))
R
René Scharfe 已提交
1719
		return alloc_ref_with_prefix("refs/", 5, name);
1720

R
René Scharfe 已提交
1721
	return alloc_ref_with_prefix("refs/heads/", 11, name);
1722 1723
}

1724
int get_fetch_map(const struct ref *remote_refs,
1725
		  const struct refspec_item *refspec,
1726 1727
		  struct ref ***tail,
		  int missing_ok)
1728
{
D
Daniel Barkalow 已提交
1729
	struct ref *ref_map, **rmp;
1730 1731 1732 1733

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

1736 1737
		if (refspec->exact_sha1) {
			ref_map = alloc_ref(name);
1738
			get_oid_hex(name, &ref_map->old_oid);
1739 1740 1741
		} else {
			ref_map = get_remote_ref(remote_refs, name);
		}
1742 1743 1744 1745 1746 1747 1748
		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;
		}
1749 1750
	}

D
Daniel Barkalow 已提交
1751 1752
	for (rmp = &ref_map; *rmp; ) {
		if ((*rmp)->peer_ref) {
1753
			if (!starts_with((*rmp)->peer_ref->name, "refs/") ||
1754
			    check_refname_format((*rmp)->peer_ref->name, 0)) {
D
Daniel Barkalow 已提交
1755 1756 1757 1758 1759 1760 1761 1762 1763 1764
				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);
1765 1766
	}

1767 1768
	if (ref_map)
		tail_link_ref(ref_map, tail);
1769 1770 1771

	return 0;
}
1772 1773 1774 1775 1776 1777 1778

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)) {
1779
			oidcpy(&ref->old_oid, &list->old_oid);
1780 1781 1782 1783
			return 0;
		}
	return 1;
}
1784

1785 1786 1787
static void unmark_and_free(struct commit_list *list, unsigned int mark)
{
	while (list) {
1788 1789
		struct commit *commit = pop_commit(&list);
		commit->object.flags &= ~mark;
1790 1791 1792
	}
}

1793
int ref_newer(const struct object_id *new_oid, const struct object_id *old_oid)
1794 1795
{
	struct object *o;
1796
	struct commit *old_commit, *new_commit;
1797 1798 1799
	struct commit_list *list, *used;
	int found = 0;

1800
	/*
1801 1802
	 * Both new_commit and old_commit must be commit-ish and new_commit is descendant of
	 * old_commit.  Otherwise we require --force.
1803
	 */
1804
	o = deref_tag(parse_object(the_repository, old_oid), NULL, 0);
1805 1806
	if (!o || o->type != OBJ_COMMIT)
		return 0;
1807
	old_commit = (struct commit *) o;
1808

1809
	o = deref_tag(parse_object(the_repository, new_oid), NULL, 0);
1810 1811
	if (!o || o->type != OBJ_COMMIT)
		return 0;
1812
	new_commit = (struct commit *) o;
1813

1814
	if (parse_commit(new_commit) < 0)
1815 1816 1817
		return 0;

	used = list = NULL;
1818
	commit_list_insert(new_commit, &list);
1819
	while (list) {
1820 1821 1822
		new_commit = pop_most_recent_commit(&list, TMP_MARK);
		commit_list_insert(new_commit, &used);
		if (new_commit == old_commit) {
1823 1824 1825 1826 1827 1828 1829 1830 1831
			found = 1;
			break;
		}
	}
	unmark_and_free(list, TMP_MARK);
	unmark_and_free(used, TMP_MARK);
	return found;
}

1832
/*
1833 1834 1835 1836 1837 1838 1839 1840 1841 1842
 * 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.
1843
 *
1844
 * Returns -1 if num_ours and num_theirs could not be filled in (e.g., no
1845 1846
 * upstream defined, or ref does not exist).  Returns 0 if the commits are
 * identical.  Returns 1 if commits are different.
1847
 */
1848
int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs,
1849
		       const char **upstream_name, enum ahead_behind_flags abf)
1850
{
1851
	struct object_id oid;
1852 1853
	struct commit *ours, *theirs;
	struct rev_info revs;
1854 1855
	const char *base;
	struct argv_array argv = ARGV_ARRAY_INIT;
1856

1857
	/* Cannot stat unless we are marked to build on top of somebody else. */
1858
	base = branch_get_upstream(branch, NULL);
1859 1860
	if (upstream_name)
		*upstream_name = base;
1861
	if (!base)
1862
		return -1;
1863

1864
	/* Cannot stat if what we used to build on no longer exists */
1865
	if (read_ref(base, &oid))
1866
		return -1;
1867
	theirs = lookup_commit_reference(&oid);
1868
	if (!theirs)
1869
		return -1;
1870

1871
	if (read_ref(branch->refname, &oid))
1872
		return -1;
1873
	ours = lookup_commit_reference(&oid);
1874
	if (!ours)
1875
		return -1;
1876

1877 1878
	*num_theirs = *num_ours = 0;

1879
	/* are we the same? */
1880
	if (theirs == ours)
1881
		return 0;
1882 1883
	if (abf == AHEAD_BEHIND_QUICK)
		return 1;
1884 1885
	if (abf != AHEAD_BEHIND_FULL)
		BUG("stat_tracking_info: invalid abf '%d'", abf);
1886

1887
	/* Run "rev-list --left-right ours...theirs" internally... */
1888 1889 1890
	argv_array_push(&argv, ""); /* ignored */
	argv_array_push(&argv, "--left-right");
	argv_array_pushf(&argv, "%s...%s",
1891 1892
			 oid_to_hex(&ours->object.oid),
			 oid_to_hex(&theirs->object.oid));
1893
	argv_array_push(&argv, "--");
1894 1895

	init_revisions(&revs, NULL);
1896
	setup_revisions(argv.argc, argv.argv, &revs, NULL);
1897 1898
	if (prepare_revision_walk(&revs))
		die("revision walk setup failed");
1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909

	/* ... 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)++;
	}
1910 1911 1912 1913

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

	argv_array_clear(&argv);
1916
	return 1;
1917 1918 1919 1920 1921
}

/*
 * Return true when there is anything to report, otherwise false.
 */
1922 1923
int format_tracking_info(struct branch *branch, struct strbuf *sb,
			 enum ahead_behind_flags abf)
1924
{
1925
	int ours, theirs, sti;
1926
	const char *full_base;
1927
	char *base;
1928
	int upstream_is_gone = 0;
1929

1930 1931
	sti = stat_tracking_info(branch, &ours, &theirs, &full_base, abf);
	if (sti < 0) {
1932 1933
		if (!full_base)
			return 0;
1934 1935
		upstream_is_gone = 1;
	}
1936

1937
	base = shorten_unambiguous_ref(full_base, 0);
1938 1939 1940 1941 1942
	if (upstream_is_gone) {
		strbuf_addf(sb,
			_("Your branch is based on '%s', but the upstream is gone.\n"),
			base);
		if (advice_status_hints)
1943
			strbuf_addstr(sb,
1944
				_("  (use \"git branch --unset-upstream\" to fixup)\n"));
1945
	} else if (!sti) {
1946
		strbuf_addf(sb,
1947
			_("Your branch is up to date with '%s'.\n"),
1948
			base);
1949 1950 1951 1952 1953 1954 1955
	} 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");
1956
	} else if (!theirs) {
1957 1958 1959
		strbuf_addf(sb,
			Q_("Your branch is ahead of '%s' by %d commit.\n",
			   "Your branch is ahead of '%s' by %d commits.\n",
1960 1961
			   ours),
			base, ours);
1962
		if (advice_status_hints)
1963
			strbuf_addstr(sb,
1964
				_("  (use \"git push\" to publish your local commits)\n"));
1965
	} else if (!ours) {
1966 1967 1968 1969 1970
		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",
1971 1972
			   theirs),
			base, theirs);
1973
		if (advice_status_hints)
1974
			strbuf_addstr(sb,
1975
				_("  (use \"git pull\" to update your local branch)\n"));
1976
	} else {
1977 1978 1979 1980 1981 1982 1983
		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",
1984
			   ours + theirs),
1985
			base, ours, theirs);
1986
		if (advice_status_hints)
1987
			strbuf_addstr(sb,
1988
				_("  (use \"git pull\" to merge the remote branch into yours)\n"));
1989
	}
1990
	free(base);
1991 1992
	return 1;
}
1993

1994 1995
static int one_local_ref(const char *refname, const struct object_id *oid,
			 int flag, void *cb_data)
1996 1997 1998 1999 2000
{
	struct ref ***local_tail = cb_data;
	struct ref *ref;

	/* we already know it starts with refs/ to get here */
2001
	if (check_refname_format(refname + 5, 0))
2002 2003
		return 0;

2004
	ref = alloc_ref(refname);
2005
	oidcpy(&ref->new_oid, oid);
2006 2007 2008 2009 2010 2011 2012
	**local_tail = ref;
	*local_tail = &ref->next;
	return 0;
}

struct ref *get_local_heads(void)
{
2013
	struct ref *local_refs = NULL, **local_tail = &local_refs;
2014

2015 2016 2017
	for_each_ref(one_local_ref, &local_tail);
	return local_refs;
}
J
Jay Soffian 已提交
2018

2019 2020 2021
struct ref *guess_remote_head(const struct ref *head,
			      const struct ref *refs,
			      int all)
J
Jay Soffian 已提交
2022 2023
{
	const struct ref *r;
2024 2025
	struct ref *list = NULL;
	struct ref **tail = &list;
J
Jay Soffian 已提交
2026

2027
	if (!head)
J
Jay Soffian 已提交
2028 2029
		return NULL;

2030 2031 2032 2033 2034 2035 2036 2037
	/*
	 * 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 已提交
2038
	/* If refs/heads/master could be right, it is. */
2039 2040
	if (!all) {
		r = find_ref_by_name(refs, "refs/heads/master");
2041
		if (r && !oidcmp(&r->old_oid, &head->old_oid))
2042 2043
			return copy_ref(r);
	}
J
Jay Soffian 已提交
2044 2045

	/* Look for another ref that points there */
2046
	for (r = refs; r; r = r->next) {
2047
		if (r != head &&
2048
		    starts_with(r->name, "refs/heads/") &&
2049
		    !oidcmp(&r->old_oid, &head->old_oid)) {
2050 2051 2052 2053 2054 2055
			*tail = copy_ref(r);
			tail = &((*tail)->next);
			if (!all)
				break;
		}
	}
J
Jay Soffian 已提交
2056

2057
	return list;
J
Jay Soffian 已提交
2058
}
2059 2060 2061 2062

struct stale_heads_info {
	struct string_list *ref_names;
	struct ref **stale_refs_tail;
2063
	struct refspec *rs;
2064 2065
};

2066 2067
static int get_stale_heads_cb(const char *refname, const struct object_id *oid,
			      int flags, void *cb_data)
2068 2069
{
	struct stale_heads_info *info = cb_data;
2070
	struct string_list matches = STRING_LIST_INIT_DUP;
2071
	struct refspec_item query;
2072
	int i, stale = 1;
2073
	memset(&query, 0, sizeof(struct refspec_item));
2074 2075
	query.dst = (char *)refname;

2076
	query_refspecs_multiple(info->rs, &query, &matches);
2077 2078
	if (matches.nr == 0)
		goto clean_exit; /* No matches */
2079 2080 2081 2082

	/*
	 * 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
2083 2084 2085
	 * remote, we consider it to be stale. In order to deal with
	 * overlapping refspecs, we need to go over all of the
	 * matching refs.
2086
	 */
2087 2088 2089 2090 2091 2092 2093 2094
	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) {
2095
		struct ref *ref = make_linked_ref(refname, &info->stale_refs_tail);
2096
		oidcpy(&ref->new_oid, oid);
2097
	}
2098

2099 2100
clean_exit:
	string_list_clear(&matches, 0);
2101 2102 2103
	return 0;
}

2104
struct ref *get_stale_heads(struct refspec *rs, struct ref *fetch_map)
2105 2106
{
	struct ref *ref, *stale_refs = NULL;
2107
	struct string_list ref_names = STRING_LIST_INIT_NODUP;
2108
	struct stale_heads_info info;
2109

2110 2111
	info.ref_names = &ref_names;
	info.stale_refs_tail = &stale_refs;
2112
	info.rs = rs;
2113
	for (ref = fetch_map; ref; ref = ref->next)
2114
		string_list_append(&ref_names, ref->name);
2115
	string_list_sort(&ref_names);
2116 2117 2118 2119
	for_each_ref(get_stale_heads_cb, &info);
	string_list_clear(&ref_names, 0);
	return stale_refs;
}
2120 2121 2122 2123

/*
 * Compare-and-swap
 */
2124
static void clear_cas_option(struct push_cas_option *cas)
2125 2126 2127 2128 2129 2130 2131 2132 2133 2134 2135 2136 2137 2138 2139 2140 2141 2142 2143 2144 2145
{
	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;
}

2146
static int parse_push_cas_option(struct push_cas_option *cas, const char *arg, int unset)
2147 2148 2149 2150 2151 2152 2153 2154 2155 2156 2157 2158 2159 2160 2161 2162 2163 2164 2165 2166 2167
{
	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;
2168
	else if (!colon[1])
2169 2170
		oidclr(&entry->expect);
	else if (get_oid(colon + 1, &entry->expect))
2171 2172 2173 2174 2175 2176 2177 2178
		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);
}
2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 2190 2191

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,
2192
			   struct object_id *oid)
2193 2194 2195
{
	char *dst;

2196
	dst = apply_refspecs(&remote->fetch, refname);
2197 2198
	if (!dst)
		return -1; /* no tracking ref for refname at remote */
2199
	if (read_ref(dst, oid))
2200 2201 2202 2203 2204 2205 2206 2207 2208 2209 2210 2211 2212
		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];
2213
		if (!refname_match(entry->refname, ref->name))
2214 2215 2216
			continue;
		ref->expect_old_sha1 = 1;
		if (!entry->use_tracking)
2217
			oidcpy(&ref->old_oid_expect, &entry->expect);
2218
		else if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
2219
			oidclr(&ref->old_oid_expect);
2220 2221 2222 2223 2224 2225 2226 2227
		return;
	}

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

	ref->expect_old_sha1 = 1;
2228
	if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
2229
		oidclr(&ref->old_oid_expect);
2230 2231 2232 2233 2234 2235 2236 2237 2238 2239
}

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