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

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

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

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

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

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

46
static struct rewrites rewrites;
47
static struct rewrites rewrites_push;
48

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

249
		strbuf_rtrim(&buf);
250

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

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

	if (!f)
		return;
270

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

547 548
	read_config();

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

	return query.dst;
}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

1099 1100
		if (rs[i].pattern) {
			const char *dst_side = rs[i].dst ? rs[i].dst : rs[i].src;
F
Felipe Contreras 已提交
1101 1102 1103 1104 1105 1106
			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) {
1107 1108 1109 1110
				matching_refs = i;
				break;
			}
		}
1111
	}
1112
	if (matching_refs == -1)
1113
		return NULL;
1114 1115 1116 1117 1118 1119 1120 1121

	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.
		 */
1122
		if (!send_mirror && !starts_with(ref->name, "refs/heads/"))
1123 1124 1125 1126 1127 1128
			return NULL;
		name = xstrdup(ref->name);
	}
	if (ret_pat)
		*ret_pat = pat;
	return name;
1129 1130
}

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

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

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

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

1182
	string_list_sort(&dst_tag);
J
Junio C Hamano 已提交
1183 1184 1185

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

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

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

1243 1244 1245 1246 1247
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;

1248
	string_list_sort(ref_index);
1249 1250
}

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.
 */
int check_push_refs(struct ref *src, int nr_refspec, const char **refspec_names)
{
1259
	struct refspec refspec = REFSPEC_INIT_PUSH;
1260 1261 1262
	int ret = 0;
	int i;

1263 1264 1265 1266
	refspec_appendn(&refspec, refspec_names, nr_refspec);

	for (i = 0; i < refspec.nr; i++) {
		struct refspec_item *rs = &refspec.items[i];
1267 1268 1269 1270 1271 1272 1273

		if (rs->pattern || rs->matching)
			continue;

		ret |= match_explicit_lhs(src, rs, NULL, NULL);
	}

1274
	refspec_clear(&refspec);
1275 1276 1277
	return ret;
}

1278
/*
1279 1280 1281 1282 1283 1284
 * 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).
1285
 */
1286 1287
int match_push_refs(struct ref *src, struct ref **dst,
		    int nr_refspec, const char **refspec, int flags)
1288
{
1289
	struct refspec rs = REFSPEC_INIT_PUSH;
A
Andy Whitcroft 已提交
1290 1291
	int send_all = flags & MATCH_REFS_ALL;
	int send_mirror = flags & MATCH_REFS_MIRROR;
F
Felipe Contreras 已提交
1292
	int send_prune = flags & MATCH_REFS_PRUNE;
1293
	int errs;
1294
	static const char *default_refspec[] = { ":", NULL };
1295
	struct ref *ref, **dst_tail = tail_ref(dst);
1296
	struct string_list dst_ref_index = STRING_LIST_INIT_NODUP;
1297

1298 1299 1300 1301
	if (!nr_refspec) {
		nr_refspec = 1;
		refspec = default_refspec;
	}
1302 1303
	refspec_appendn(&rs, refspec, nr_refspec);
	errs = match_explicit_refs(src, *dst, &dst_tail, rs.items, rs.nr);
1304 1305

	/* pick the remainder */
1306
	for (ref = src; ref; ref = ref->next) {
1307
		struct string_list_item *dst_item;
1308
		struct ref *dst_peer;
1309
		const struct refspec_item *pat = NULL;
1310
		char *dst_name;
1311

1312
		dst_name = get_ref_match(rs.items, rs.nr, ref, send_mirror, FROM_SRC, &pat);
1313
		if (!dst_name)
1314 1315
			continue;

1316 1317 1318 1319 1320
		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;
1321 1322 1323 1324 1325 1326 1327 1328 1329
		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 已提交
1330
				 * --all or --mirror.
1331 1332
				 */
				goto free_name;
A
Andy Whitcroft 已提交
1333

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

1346 1347
	string_list_clear(&dst_ref_index, 0);

J
Junio C Hamano 已提交
1348 1349 1350
	if (flags & MATCH_REFS_FOLLOW_TAGS)
		add_missing_tags(src, dst, &dst_tail);

F
Felipe Contreras 已提交
1351
	if (send_prune) {
1352
		struct string_list src_ref_index = STRING_LIST_INIT_NODUP;
F
Felipe Contreras 已提交
1353 1354 1355 1356 1357 1358 1359 1360
		/* 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;

1361
			src_name = get_ref_match(rs.items, rs.nr, ref, send_mirror, FROM_DST, NULL);
F
Felipe Contreras 已提交
1362
			if (src_name) {
1363 1364 1365 1366
				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 已提交
1367 1368 1369 1370
					ref->peer_ref = alloc_delete_ref();
				free(src_name);
			}
		}
1371
		string_list_clear(&src_ref_index, 0);
F
Felipe Contreras 已提交
1372
	}
1373 1374 1375

	refspec_clear(&rs);

1376 1377
	if (errs)
		return -1;
1378 1379
	return 0;
}
1380

1381
void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
1382
			     int force_update)
1383 1384 1385 1386
{
	struct ref *ref;

	for (ref = remote_refs; ref; ref = ref->next) {
1387
		int force_ref_update = ref->force || force_update;
1388
		int reject_reason = 0;
1389

1390
		if (ref->peer_ref)
1391
			oidcpy(&ref->new_oid, &ref->peer_ref->new_oid);
1392 1393 1394
		else if (!send_mirror)
			continue;

1395
		ref->deletion = is_null_oid(&ref->new_oid);
1396
		if (!ref->deletion &&
1397
			!oidcmp(&ref->old_oid, &ref->new_oid)) {
1398 1399 1400 1401
			ref->status = REF_STATUS_UPTODATE;
			continue;
		}

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

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

1440
		if (!reject_reason && !ref->deletion && !is_null_oid(&ref->old_oid)) {
1441
			if (starts_with(ref->name, "refs/tags/"))
1442
				reject_reason = REF_STATUS_REJECT_ALREADY_EXISTS;
1443
			else if (!has_object_file(&ref->old_oid))
1444
				reject_reason = REF_STATUS_REJECT_FETCH_FIRST;
1445 1446
			else if (!lookup_commit_reference_gently(&ref->old_oid, 1) ||
				 !lookup_commit_reference_gently(&ref->new_oid, 1))
1447
				reject_reason = REF_STATUS_REJECT_NEEDS_FORCE;
1448
			else if (!ref_newer(&ref->new_oid, &ref->old_oid))
1449
				reject_reason = REF_STATUS_REJECT_NONFASTFORWARD;
1450
		}
1451 1452 1453 1454 1455 1456 1457 1458 1459

		/*
		 * "--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;
1460 1461 1462
	}
}

1463 1464
static void set_merge(struct branch *ret)
{
1465
	struct remote *remote;
1466
	char *ref;
1467
	struct object_id oid;
1468 1469
	int i;

1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482
	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;
	}

1483 1484
	remote = remote_get(ret->remote_name);

1485 1486 1487 1488
	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]);
1489
		if (!remote_find_tracking(remote, ret->merge[i]) ||
1490 1491 1492
		    strcmp(ret->remote_name, "."))
			continue;
		if (dwim_ref(ret->merge_name[i], strlen(ret->merge_name[i]),
1493
			     &oid, &ref) == 1)
1494 1495 1496 1497 1498 1499
			ret->merge[i]->dst = ref;
		else
			ret->merge[i]->dst = xstrdup(ret->merge_name[i]);
	}
}

1500 1501 1502 1503 1504 1505 1506 1507 1508
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);
1509
	set_merge(ret);
1510 1511 1512 1513 1514 1515 1516 1517
	return ret;
}

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

1518 1519 1520
int branch_merge_matches(struct branch *branch,
		                 int i,
		                 const char *refname)
1521
{
1522
	if (!branch || i < 0 || i >= branch->merge_nr)
1523
		return 0;
1524
	return refname_match(branch->merge[i]->src, refname);
1525
}
1526

1527
__attribute__((format (printf,2,3)))
1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542
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"));
1543 1544 1545 1546 1547 1548 1549

	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?
		 */
1550 1551 1552
		if (!ref_exists(branch->refname))
			return error_buf(err, _("no such branch: '%s'"),
					 branch->name);
1553 1554 1555 1556 1557 1558
		return error_buf(err,
				 _("no upstream configured for branch '%s'"),
				 branch->name);
	}

	if (!branch->merge[0]->dst)
1559 1560 1561 1562
		return error_buf(err,
				 _("upstream branch '%s' not stored as a remote-tracking branch"),
				 branch->merge[0]->src);

1563 1564 1565
	return branch->merge[0]->dst;
}

J
Jeff King 已提交
1566 1567 1568 1569 1570 1571
static const char *tracking_for_push_dest(struct remote *remote,
					  const char *refname,
					  struct strbuf *err)
{
	char *ret;

1572
	ret = apply_refspecs(&remote->fetch, refname);
J
Jeff King 已提交
1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589
	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);

1590
	if (remote->push.nr) {
J
Jeff King 已提交
1591 1592 1593
		char *dst;
		const char *ret;

1594
		dst = apply_refspecs(&remote->push, branch->refname);
J
Jeff King 已提交
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 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641
		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)
{
1642 1643 1644
	if (!branch)
		return error_buf(err, _("HEAD does not point to a branch"));

J
Jeff King 已提交
1645 1646 1647 1648 1649
	if (!branch->push_tracking_ref)
		branch->push_tracking_ref = branch_get_push_1(branch, err);
	return branch->push_tracking_ref;
}

1650 1651 1652 1653
static int ignore_symref_update(const char *refname)
{
	int flag;

1654
	if (!resolve_ref_unsafe(refname, 0, NULL, &flag))
1655 1656 1657 1658
		return 0; /* non-existing refs are OK */
	return (flag & REF_ISSYMREF);
}

1659 1660 1661 1662 1663 1664 1665
/*
 * 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.
 */
1666
static struct ref *get_expanded_map(const struct ref *remote_refs,
1667
				    const struct refspec_item *refspec)
1668
{
1669
	const struct ref *ref;
1670 1671 1672 1673
	struct ref *ret = NULL;
	struct ref **tail = &ret;

	for (ref = remote_refs; ref; ref = ref->next) {
1674 1675
		char *expn_name = NULL;

1676 1677
		if (strchr(ref->name, '^'))
			continue; /* a dereference item */
1678
		if (match_name_with_pattern(refspec->src, ref->name,
1679 1680
					    refspec->dst, &expn_name) &&
		    !ignore_symref_update(expn_name)) {
1681 1682
			struct ref *cpy = copy_ref(ref);

1683
			cpy->peer_ref = alloc_ref(expn_name);
1684 1685 1686 1687 1688
			if (refspec->force)
				cpy->peer_ref->force = 1;
			*tail = cpy;
			tail = &cpy->next;
		}
1689
		free(expn_name);
1690 1691 1692 1693 1694
	}

	return ret;
}

1695
static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
1696
{
1697
	const struct ref *ref;
1698
	for (ref = refs; ref; ref = ref->next) {
1699
		if (refname_match(name, ref->name))
1700 1701 1702 1703 1704
			return ref;
	}
	return NULL;
}

1705
struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
1706
{
1707
	const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
1708 1709

	if (!ref)
1710
		return NULL;
1711 1712 1713 1714 1715 1716

	return copy_ref(ref);
}

static struct ref *get_local_ref(const char *name)
{
1717
	if (!name || name[0] == '\0')
1718 1719
		return NULL;

1720
	if (starts_with(name, "refs/"))
1721
		return alloc_ref(name);
1722

1723 1724 1725
	if (starts_with(name, "heads/") ||
	    starts_with(name, "tags/") ||
	    starts_with(name, "remotes/"))
R
René Scharfe 已提交
1726
		return alloc_ref_with_prefix("refs/", 5, name);
1727

R
René Scharfe 已提交
1728
	return alloc_ref_with_prefix("refs/heads/", 11, name);
1729 1730
}

1731
int get_fetch_map(const struct ref *remote_refs,
1732
		  const struct refspec_item *refspec,
1733 1734
		  struct ref ***tail,
		  int missing_ok)
1735
{
D
Daniel Barkalow 已提交
1736
	struct ref *ref_map, **rmp;
1737 1738 1739 1740

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

1743 1744
		if (refspec->exact_sha1) {
			ref_map = alloc_ref(name);
1745
			get_oid_hex(name, &ref_map->old_oid);
1746 1747 1748
		} else {
			ref_map = get_remote_ref(remote_refs, name);
		}
1749 1750 1751 1752 1753 1754 1755
		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;
		}
1756 1757
	}

D
Daniel Barkalow 已提交
1758 1759
	for (rmp = &ref_map; *rmp; ) {
		if ((*rmp)->peer_ref) {
1760
			if (!starts_with((*rmp)->peer_ref->name, "refs/") ||
1761
			    check_refname_format((*rmp)->peer_ref->name, 0)) {
D
Daniel Barkalow 已提交
1762 1763 1764 1765 1766 1767 1768 1769 1770 1771
				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);
1772 1773
	}

1774 1775
	if (ref_map)
		tail_link_ref(ref_map, tail);
1776 1777 1778

	return 0;
}
1779 1780 1781 1782 1783 1784 1785

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)) {
1786
			oidcpy(&ref->old_oid, &list->old_oid);
1787 1788 1789 1790
			return 0;
		}
	return 1;
}
1791

1792 1793 1794
static void unmark_and_free(struct commit_list *list, unsigned int mark)
{
	while (list) {
1795 1796
		struct commit *commit = pop_commit(&list);
		commit->object.flags &= ~mark;
1797 1798 1799
	}
}

1800
int ref_newer(const struct object_id *new_oid, const struct object_id *old_oid)
1801 1802
{
	struct object *o;
1803
	struct commit *old_commit, *new_commit;
1804 1805 1806
	struct commit_list *list, *used;
	int found = 0;

1807
	/*
1808 1809
	 * Both new_commit and old_commit must be commit-ish and new_commit is descendant of
	 * old_commit.  Otherwise we require --force.
1810
	 */
1811
	o = deref_tag(parse_object(old_oid), NULL, 0);
1812 1813
	if (!o || o->type != OBJ_COMMIT)
		return 0;
1814
	old_commit = (struct commit *) o;
1815

1816
	o = deref_tag(parse_object(new_oid), NULL, 0);
1817 1818
	if (!o || o->type != OBJ_COMMIT)
		return 0;
1819
	new_commit = (struct commit *) o;
1820

1821
	if (parse_commit(new_commit) < 0)
1822 1823 1824
		return 0;

	used = list = NULL;
1825
	commit_list_insert(new_commit, &list);
1826
	while (list) {
1827 1828 1829
		new_commit = pop_most_recent_commit(&list, TMP_MARK);
		commit_list_insert(new_commit, &used);
		if (new_commit == old_commit) {
1830 1831 1832 1833 1834 1835 1836 1837 1838
			found = 1;
			break;
		}
	}
	unmark_and_free(list, TMP_MARK);
	unmark_and_free(used, TMP_MARK);
	return found;
}

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

1864
	/* Cannot stat unless we are marked to build on top of somebody else. */
1865
	base = branch_get_upstream(branch, NULL);
1866 1867
	if (upstream_name)
		*upstream_name = base;
1868
	if (!base)
1869
		return -1;
1870

1871
	/* Cannot stat if what we used to build on no longer exists */
1872
	if (read_ref(base, &oid))
1873
		return -1;
1874
	theirs = lookup_commit_reference(&oid);
1875
	if (!theirs)
1876
		return -1;
1877

1878
	if (read_ref(branch->refname, &oid))
1879
		return -1;
1880
	ours = lookup_commit_reference(&oid);
1881
	if (!ours)
1882
		return -1;
1883

1884 1885
	*num_theirs = *num_ours = 0;

1886
	/* are we the same? */
1887
	if (theirs == ours)
1888
		return 0;
1889 1890
	if (abf == AHEAD_BEHIND_QUICK)
		return 1;
1891 1892
	if (abf != AHEAD_BEHIND_FULL)
		BUG("stat_tracking_info: invalid abf '%d'", abf);
1893

1894
	/* Run "rev-list --left-right ours...theirs" internally... */
1895 1896 1897
	argv_array_push(&argv, ""); /* ignored */
	argv_array_push(&argv, "--left-right");
	argv_array_pushf(&argv, "%s...%s",
1898 1899
			 oid_to_hex(&ours->object.oid),
			 oid_to_hex(&theirs->object.oid));
1900
	argv_array_push(&argv, "--");
1901 1902

	init_revisions(&revs, NULL);
1903
	setup_revisions(argv.argc, argv.argv, &revs, NULL);
1904 1905
	if (prepare_revision_walk(&revs))
		die("revision walk setup failed");
1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916

	/* ... 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)++;
	}
1917 1918 1919 1920

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

	argv_array_clear(&argv);
1923
	return 1;
1924 1925 1926 1927 1928
}

/*
 * Return true when there is anything to report, otherwise false.
 */
1929 1930
int format_tracking_info(struct branch *branch, struct strbuf *sb,
			 enum ahead_behind_flags abf)
1931
{
1932
	int ours, theirs, sti;
1933
	const char *full_base;
1934
	char *base;
1935
	int upstream_is_gone = 0;
1936

1937 1938
	sti = stat_tracking_info(branch, &ours, &theirs, &full_base, abf);
	if (sti < 0) {
1939 1940
		if (!full_base)
			return 0;
1941 1942
		upstream_is_gone = 1;
	}
1943

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

2001 2002
static int one_local_ref(const char *refname, const struct object_id *oid,
			 int flag, void *cb_data)
2003 2004 2005 2006 2007
{
	struct ref ***local_tail = cb_data;
	struct ref *ref;

	/* we already know it starts with refs/ to get here */
2008
	if (check_refname_format(refname + 5, 0))
2009 2010
		return 0;

2011
	ref = alloc_ref(refname);
2012
	oidcpy(&ref->new_oid, oid);
2013 2014 2015 2016 2017 2018 2019
	**local_tail = ref;
	*local_tail = &ref->next;
	return 0;
}

struct ref *get_local_heads(void)
{
2020
	struct ref *local_refs = NULL, **local_tail = &local_refs;
2021

2022 2023 2024
	for_each_ref(one_local_ref, &local_tail);
	return local_refs;
}
J
Jay Soffian 已提交
2025

2026 2027 2028
struct ref *guess_remote_head(const struct ref *head,
			      const struct ref *refs,
			      int all)
J
Jay Soffian 已提交
2029 2030
{
	const struct ref *r;
2031 2032
	struct ref *list = NULL;
	struct ref **tail = &list;
J
Jay Soffian 已提交
2033

2034
	if (!head)
J
Jay Soffian 已提交
2035 2036
		return NULL;

2037 2038 2039 2040 2041 2042 2043 2044
	/*
	 * 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 已提交
2045
	/* If refs/heads/master could be right, it is. */
2046 2047
	if (!all) {
		r = find_ref_by_name(refs, "refs/heads/master");
2048
		if (r && !oidcmp(&r->old_oid, &head->old_oid))
2049 2050
			return copy_ref(r);
	}
J
Jay Soffian 已提交
2051 2052

	/* Look for another ref that points there */
2053
	for (r = refs; r; r = r->next) {
2054
		if (r != head &&
2055
		    starts_with(r->name, "refs/heads/") &&
2056
		    !oidcmp(&r->old_oid, &head->old_oid)) {
2057 2058 2059 2060 2061 2062
			*tail = copy_ref(r);
			tail = &((*tail)->next);
			if (!all)
				break;
		}
	}
J
Jay Soffian 已提交
2063

2064
	return list;
J
Jay Soffian 已提交
2065
}
2066 2067 2068 2069

struct stale_heads_info {
	struct string_list *ref_names;
	struct ref **stale_refs_tail;
2070
	struct refspec *rs;
2071 2072
};

2073 2074
static int get_stale_heads_cb(const char *refname, const struct object_id *oid,
			      int flags, void *cb_data)
2075 2076
{
	struct stale_heads_info *info = cb_data;
2077
	struct string_list matches = STRING_LIST_INIT_DUP;
2078
	struct refspec_item query;
2079
	int i, stale = 1;
2080
	memset(&query, 0, sizeof(struct refspec_item));
2081 2082
	query.dst = (char *)refname;

2083
	query_refspecs_multiple(info->rs, &query, &matches);
2084 2085
	if (matches.nr == 0)
		goto clean_exit; /* No matches */
2086 2087 2088 2089

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

2106 2107
clean_exit:
	string_list_clear(&matches, 0);
2108 2109 2110
	return 0;
}

2111
struct ref *get_stale_heads(struct refspec *rs, struct ref *fetch_map)
2112 2113
{
	struct ref *ref, *stale_refs = NULL;
2114
	struct string_list ref_names = STRING_LIST_INIT_NODUP;
2115
	struct stale_heads_info info;
2116

2117 2118
	info.ref_names = &ref_names;
	info.stale_refs_tail = &stale_refs;
2119
	info.rs = rs;
2120
	for (ref = fetch_map; ref; ref = ref->next)
2121
		string_list_append(&ref_names, ref->name);
2122
	string_list_sort(&ref_names);
2123 2124 2125 2126
	for_each_ref(get_stale_heads_cb, &info);
	string_list_clear(&ref_names, 0);
	return stale_refs;
}
2127 2128 2129 2130

/*
 * Compare-and-swap
 */
2131
static void clear_cas_option(struct push_cas_option *cas)
2132 2133 2134 2135 2136 2137 2138 2139 2140 2141 2142 2143 2144 2145 2146 2147 2148 2149 2150 2151 2152
{
	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;
}

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

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,
2199
			   struct object_id *oid)
2200 2201 2202
{
	char *dst;

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

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

	ref->expect_old_sha1 = 1;
2235
	if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
2236
		oidclr(&ref->old_oid_expect);
2237 2238 2239 2240 2241 2242 2243 2244 2245 2246
}

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