remote.c 56.1 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
#include "commit-reach.h"
16

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

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

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

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

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

48
static struct rewrites rewrites;
49
static struct rewrites rewrites_push;
50

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

251
		strbuf_rtrim(&buf);
252

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

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

	if (!f)
		return;
272

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

549 550
	read_config();

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

	return query.dst;
}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027
static void show_push_unqualified_ref_name_error(const char *dst_value,
						 const char *matched_src_name)
{
	/*
	 * TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
	 * <remote> <src>:<dst>" push, and "being pushed ('%s')" is
	 * the <src>.
	 */
	error(_("The destination you provided is not a full refname (i.e.,\n"
		"starting with \"refs/\"). We tried to guess what you meant by:\n"
		"\n"
		"- Looking for a ref that matches '%s' on the remote side.\n"
		"- Checking if the <src> being pushed ('%s')\n"
		"  is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
		"  refs/{heads,tags}/ prefix on the remote side.\n"
		"\n"
		"Neither worked, so we gave up. You must fully qualify the ref."),
	      dst_value, matched_src_name);
}

1028 1029
static int match_explicit(struct ref *src, struct ref *dst,
			  struct ref ***dst_tail,
1030
			  struct refspec_item *rs)
1031
{
1032
	struct ref *matched_src, *matched_dst;
1033
	int allocated_src;
1034

1035
	const char *dst_value = rs->dst;
1036
	char *dst_guess;
1037

1038
	if (rs->pattern || rs->matching)
1039
		return 0;
1040

1041
	matched_src = matched_dst = NULL;
1042 1043
	if (match_explicit_lhs(src, rs, &matched_src, &allocated_src) < 0)
		return -1;
1044

1045
	if (!dst_value) {
1046 1047
		int flag;

1048 1049
		dst_value = resolve_ref_unsafe(matched_src->name,
					       RESOLVE_REF_READING,
1050
					       NULL, &flag);
1051 1052
		if (!dst_value ||
		    ((flag & REF_ISSYMREF) &&
1053
		     !starts_with(dst_value, "refs/heads/")))
1054 1055
			die("%s cannot be resolved to branch.",
			    matched_src->name);
1056
	}
1057

1058 1059 1060 1061
	switch (count_refspec_match(dst_value, dst, &matched_dst)) {
	case 1:
		break;
	case 0:
1062
		if (starts_with(dst_value, "refs/")) {
1063
			matched_dst = make_linked_ref(dst_value, dst_tail);
1064

1065
		} else if (is_null_oid(&matched_src->new_oid)) {
1066
			error(_("unable to delete '%s': remote ref does not exist"),
1067
			      dst_value);
1068
		} else if ((dst_guess = guess_ref(dst_value, matched_src))) {
1069
			matched_dst = make_linked_ref(dst_guess, dst_tail);
1070
			free(dst_guess);
1071
		} else {
1072 1073
			show_push_unqualified_ref_name_error(dst_value,
							     matched_src->name);
1074
		}
1075 1076
		break;
	default:
1077
		matched_dst = NULL;
1078
		error(_("dst refspec %s matches more than one."),
1079 1080 1081
		      dst_value);
		break;
	}
1082 1083 1084
	if (!matched_dst)
		return -1;
	if (matched_dst->peer_ref)
1085 1086
		return error(_("dst ref %s receives from more than one src."),
			     matched_dst->name);
1087
	else {
1088 1089 1090
		matched_dst->peer_ref = allocated_src ?
					matched_src :
					copy_ref(matched_src);
1091
		matched_dst->force = rs->force;
1092
	}
1093
	return 0;
1094 1095 1096
}

static int match_explicit_refs(struct ref *src, struct ref *dst,
1097
			       struct ref ***dst_tail, struct refspec *rs)
1098 1099
{
	int i, errs;
1100 1101
	for (i = errs = 0; i < rs->nr; i++)
		errs += match_explicit(src, dst, dst_tail, &rs->items[i]);
1102
	return errs;
1103 1104
}

1105 1106 1107
static char *get_ref_match(const struct refspec *rs, const struct ref *ref,
			   int send_mirror, int direction,
			   const struct refspec_item **ret_pat)
1108
{
1109
	const struct refspec_item *pat;
1110
	char *name;
1111
	int i;
1112
	int matching_refs = -1;
1113 1114 1115 1116
	for (i = 0; i < rs->nr; i++) {
		const struct refspec_item *item = &rs->items[i];
		if (item->matching &&
		    (matching_refs == -1 || item->force)) {
1117 1118 1119 1120
			matching_refs = i;
			continue;
		}

1121 1122
		if (item->pattern) {
			const char *dst_side = item->dst ? item->dst : item->src;
F
Felipe Contreras 已提交
1123 1124
			int match;
			if (direction == FROM_SRC)
1125
				match = match_name_with_pattern(item->src, ref->name, dst_side, &name);
F
Felipe Contreras 已提交
1126
			else
1127
				match = match_name_with_pattern(dst_side, ref->name, item->src, &name);
F
Felipe Contreras 已提交
1128
			if (match) {
1129 1130 1131 1132
				matching_refs = i;
				break;
			}
		}
1133
	}
1134
	if (matching_refs == -1)
1135
		return NULL;
1136

1137
	pat = &rs->items[matching_refs];
1138 1139 1140 1141 1142 1143
	if (pat->matching) {
		/*
		 * "matching refs"; traditionally we pushed everything
		 * including refs outside refs/heads/ hierarchy, but
		 * that does not make much sense these days.
		 */
1144
		if (!send_mirror && !starts_with(ref->name, "refs/heads/"))
1145 1146 1147 1148 1149 1150
			return NULL;
		name = xstrdup(ref->name);
	}
	if (ret_pat)
		*ret_pat = pat;
	return name;
1151 1152
}

1153 1154 1155 1156 1157 1158 1159 1160
static struct ref **tail_ref(struct ref **head)
{
	struct ref **tail = head;
	while (*tail)
		tail = &((*tail)->next);
	return tail;
}

J
Junio C Hamano 已提交
1161 1162 1163 1164 1165
struct tips {
	struct commit **tip;
	int nr, alloc;
};

1166
static void add_to_tips(struct tips *tips, const struct object_id *oid)
J
Junio C Hamano 已提交
1167 1168 1169
{
	struct commit *commit;

1170
	if (is_null_oid(oid))
J
Junio C Hamano 已提交
1171
		return;
1172
	commit = lookup_commit_reference_gently(the_repository, oid, 1);
J
Junio C Hamano 已提交
1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194
	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 &&
1195
		    !is_null_oid(&ref->peer_ref->new_oid))
1196
			add_to_tips(&sent_tips, &ref->peer_ref->new_oid);
J
Junio C Hamano 已提交
1197
		else
1198
			add_to_tips(&sent_tips, &ref->old_oid);
1199
		if (starts_with(ref->name, "refs/tags/"))
J
Junio C Hamano 已提交
1200 1201 1202 1203
			string_list_append(&dst_tag, ref->name);
	}
	clear_commit_marks_many(sent_tips.nr, sent_tips.tip, TMP_MARK);

1204
	string_list_sort(&dst_tag);
J
Junio C Hamano 已提交
1205 1206 1207

	/* Collect tags they do not have. */
	for (ref = src; ref; ref = ref->next) {
1208
		if (!starts_with(ref->name, "refs/tags/"))
J
Junio C Hamano 已提交
1209 1210 1211
			continue; /* not a tag */
		if (string_list_has_string(&dst_tag, ref->name))
			continue; /* they already have it */
1212
		if (oid_object_info(the_repository, &ref->new_oid, NULL) != OBJ_TAG)
J
Junio C Hamano 已提交
1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226
			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) {
1227 1228 1229 1230 1231 1232
		const int reachable_flag = 1;
		struct commit_list *found_commits;
		struct commit **src_commits;
		int nr_src_commits = 0, alloc_src_commits = 16;
		ALLOC_ARRAY(src_commits, alloc_src_commits);

J
Junio C Hamano 已提交
1233 1234
		for_each_string_list_item(item, &src_tag) {
			struct ref *ref = item->util;
1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254
			struct commit *commit;

			if (is_null_oid(&ref->new_oid))
				continue;
			commit = lookup_commit_reference_gently(the_repository,
								&ref->new_oid,
								1);
			if (!commit)
				/* not pushing a commit, which is not an error */
				continue;

			ALLOC_GROW(src_commits, nr_src_commits + 1, alloc_src_commits);
			src_commits[nr_src_commits++] = commit;
		}

		found_commits = get_reachable_subset(sent_tips.tip, sent_tips.nr,
						     src_commits, nr_src_commits,
						     reachable_flag);

		for_each_string_list_item(item, &src_tag) {
J
Junio C Hamano 已提交
1255
			struct ref *dst_ref;
1256
			struct ref *ref = item->util;
J
Junio C Hamano 已提交
1257 1258
			struct commit *commit;

1259
			if (is_null_oid(&ref->new_oid))
J
Junio C Hamano 已提交
1260
				continue;
1261 1262
			commit = lookup_commit_reference_gently(the_repository,
								&ref->new_oid,
1263
								1);
J
Junio C Hamano 已提交
1264 1265 1266 1267 1268 1269 1270 1271
			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?
			 */
1272
			if (!(commit->object.flags & reachable_flag))
J
Junio C Hamano 已提交
1273 1274 1275 1276
				continue;

			/* Add it in */
			dst_ref = make_linked_ref(ref->name, dst_tail);
1277
			oidcpy(&dst_ref->new_oid, &ref->new_oid);
J
Junio C Hamano 已提交
1278 1279
			dst_ref->peer_ref = copy_ref(ref);
		}
1280 1281 1282 1283

		clear_commit_marks_many(nr_src_commits, src_commits, reachable_flag);
		free(src_commits);
		free_commit_list(found_commits);
J
Junio C Hamano 已提交
1284
	}
1285

J
Junio C Hamano 已提交
1286 1287 1288 1289
	string_list_clear(&src_tag, 0);
	free(sent_tips.tip);
}

1290 1291 1292 1293 1294 1295 1296 1297
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;
}

1298 1299 1300 1301 1302
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;

1303
	string_list_sort(ref_index);
1304 1305
}

1306 1307 1308 1309 1310 1311
/*
 * 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.
 */
1312
int check_push_refs(struct ref *src, struct refspec *rs)
1313 1314 1315 1316
{
	int ret = 0;
	int i;

1317 1318
	for (i = 0; i < rs->nr; i++) {
		struct refspec_item *item = &rs->items[i];
1319

1320
		if (item->pattern || item->matching)
1321 1322
			continue;

1323
		ret |= match_explicit_lhs(src, item, NULL, NULL);
1324 1325 1326 1327 1328
	}

	return ret;
}

1329
/*
1330 1331 1332 1333 1334 1335
 * 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).
1336
 */
1337
int match_push_refs(struct ref *src, struct ref **dst,
1338
		    struct refspec *rs, int flags)
1339
{
A
Andy Whitcroft 已提交
1340 1341
	int send_all = flags & MATCH_REFS_ALL;
	int send_mirror = flags & MATCH_REFS_MIRROR;
F
Felipe Contreras 已提交
1342
	int send_prune = flags & MATCH_REFS_PRUNE;
1343
	int errs;
1344
	struct ref *ref, **dst_tail = tail_ref(dst);
1345
	struct string_list dst_ref_index = STRING_LIST_INIT_NODUP;
1346

1347 1348 1349 1350 1351
	/* If no refspec is provided, use the default ":" */
	if (!rs->nr)
		refspec_append(rs, ":");

	errs = match_explicit_refs(src, *dst, &dst_tail, rs);
1352 1353

	/* pick the remainder */
1354
	for (ref = src; ref; ref = ref->next) {
1355
		struct string_list_item *dst_item;
1356
		struct ref *dst_peer;
1357
		const struct refspec_item *pat = NULL;
1358
		char *dst_name;
1359

1360
		dst_name = get_ref_match(rs, ref, send_mirror, FROM_SRC, &pat);
1361
		if (!dst_name)
1362 1363
			continue;

1364 1365 1366 1367 1368
		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;
1369 1370 1371 1372 1373 1374 1375 1376 1377
		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 已提交
1378
				 * --all or --mirror.
1379 1380
				 */
				goto free_name;
A
Andy Whitcroft 已提交
1381

1382
			/* Create a new one and link it */
1383
			dst_peer = make_linked_ref(dst_name, &dst_tail);
1384
			oidcpy(&dst_peer->new_oid, &ref->new_oid);
1385 1386
			string_list_insert(&dst_ref_index,
				dst_peer->name)->util = dst_peer;
1387
		}
1388
		dst_peer->peer_ref = copy_ref(ref);
1389
		dst_peer->force = pat->force;
1390 1391
	free_name:
		free(dst_name);
1392
	}
J
Junio C Hamano 已提交
1393

1394 1395
	string_list_clear(&dst_ref_index, 0);

J
Junio C Hamano 已提交
1396 1397 1398
	if (flags & MATCH_REFS_FOLLOW_TAGS)
		add_missing_tags(src, dst, &dst_tail);

F
Felipe Contreras 已提交
1399
	if (send_prune) {
1400
		struct string_list src_ref_index = STRING_LIST_INIT_NODUP;
F
Felipe Contreras 已提交
1401 1402 1403 1404 1405 1406 1407 1408
		/* 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;

1409
			src_name = get_ref_match(rs, ref, send_mirror, FROM_DST, NULL);
F
Felipe Contreras 已提交
1410
			if (src_name) {
1411 1412 1413 1414
				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 已提交
1415 1416 1417 1418
					ref->peer_ref = alloc_delete_ref();
				free(src_name);
			}
		}
1419
		string_list_clear(&src_ref_index, 0);
F
Felipe Contreras 已提交
1420
	}
1421

1422 1423
	if (errs)
		return -1;
1424 1425
	return 0;
}
1426

1427
void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
1428
			     int force_update)
1429 1430 1431 1432
{
	struct ref *ref;

	for (ref = remote_refs; ref; ref = ref->next) {
1433
		int force_ref_update = ref->force || force_update;
1434
		int reject_reason = 0;
1435

1436
		if (ref->peer_ref)
1437
			oidcpy(&ref->new_oid, &ref->peer_ref->new_oid);
1438 1439 1440
		else if (!send_mirror)
			continue;

1441
		ref->deletion = is_null_oid(&ref->new_oid);
1442
		if (!ref->deletion &&
J
Jeff King 已提交
1443
			oideq(&ref->old_oid, &ref->new_oid)) {
1444 1445 1446 1447
			ref->status = REF_STATUS_UPTODATE;
			continue;
		}

C
Chris Rorvick 已提交
1448
		/*
1449 1450
		 * If the remote ref has moved and is now different
		 * from what we expect, reject any push.
1451 1452 1453 1454 1455 1456 1457
		 *
		 * 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) {
1458
			if (!oideq(&ref->old_oid, &ref->old_oid_expect))
1459
				reject_reason = REF_STATUS_REJECT_STALE;
1460 1461 1462
			else
				/* If the ref isn't stale then force the update. */
				force_ref_update = 1;
1463 1464 1465
		}

		/*
1466 1467
		 * If the update isn't already rejected then check
		 * the usual "must fast-forward" rules.
1468
		 *
1469 1470 1471
		 * Decide whether an individual refspec A:B can be
		 * pushed.  The push will succeed if any of the
		 * following are true:
1472
		 *
C
Chris Rorvick 已提交
1473
		 * (1) the remote reference B does not exist
1474
		 *
C
Chris Rorvick 已提交
1475 1476
		 * (2) the remote reference B is being removed (i.e.,
		 *     pushing :B where no source is specified)
1477
		 *
1478 1479 1480
		 * (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.
1481
		 *
C
Chris Rorvick 已提交
1482 1483
		 * (4) it is forced using the +A:B notation, or by
		 *     passing the --force argument
1484 1485
		 */

1486
		if (!reject_reason && !ref->deletion && !is_null_oid(&ref->old_oid)) {
1487
			if (starts_with(ref->name, "refs/tags/"))
1488
				reject_reason = REF_STATUS_REJECT_ALREADY_EXISTS;
1489
			else if (!has_object_file(&ref->old_oid))
1490
				reject_reason = REF_STATUS_REJECT_FETCH_FIRST;
1491 1492
			else if (!lookup_commit_reference_gently(the_repository, &ref->old_oid, 1) ||
				 !lookup_commit_reference_gently(the_repository, &ref->new_oid, 1))
1493
				reject_reason = REF_STATUS_REJECT_NEEDS_FORCE;
1494
			else if (!ref_newer(&ref->new_oid, &ref->old_oid))
1495
				reject_reason = REF_STATUS_REJECT_NONFASTFORWARD;
1496
		}
1497 1498 1499 1500 1501 1502 1503 1504 1505

		/*
		 * "--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;
1506 1507 1508
	}
}

1509 1510
static void set_merge(struct branch *ret)
{
1511
	struct remote *remote;
1512
	char *ref;
1513
	struct object_id oid;
1514 1515
	int i;

1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528
	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;
	}

1529 1530
	remote = remote_get(ret->remote_name);

1531 1532 1533 1534
	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]);
1535
		if (!remote_find_tracking(remote, ret->merge[i]) ||
1536 1537 1538
		    strcmp(ret->remote_name, "."))
			continue;
		if (dwim_ref(ret->merge_name[i], strlen(ret->merge_name[i]),
1539
			     &oid, &ref) == 1)
1540 1541 1542 1543 1544 1545
			ret->merge[i]->dst = ref;
		else
			ret->merge[i]->dst = xstrdup(ret->merge_name[i]);
	}
}

1546 1547 1548 1549 1550 1551 1552 1553 1554
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);
1555
	set_merge(ret);
1556 1557 1558 1559 1560 1561 1562 1563
	return ret;
}

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

1564 1565 1566
int branch_merge_matches(struct branch *branch,
		                 int i,
		                 const char *refname)
1567
{
1568
	if (!branch || i < 0 || i >= branch->merge_nr)
1569
		return 0;
1570
	return refname_match(branch->merge[i]->src, refname);
1571
}
1572

1573
__attribute__((format (printf,2,3)))
1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588
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"));
1589 1590 1591 1592 1593 1594 1595

	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?
		 */
1596 1597 1598
		if (!ref_exists(branch->refname))
			return error_buf(err, _("no such branch: '%s'"),
					 branch->name);
1599 1600 1601 1602 1603 1604
		return error_buf(err,
				 _("no upstream configured for branch '%s'"),
				 branch->name);
	}

	if (!branch->merge[0]->dst)
1605 1606 1607 1608
		return error_buf(err,
				 _("upstream branch '%s' not stored as a remote-tracking branch"),
				 branch->merge[0]->src);

1609 1610 1611
	return branch->merge[0]->dst;
}

J
Jeff King 已提交
1612 1613 1614 1615 1616 1617
static const char *tracking_for_push_dest(struct remote *remote,
					  const char *refname,
					  struct strbuf *err)
{
	char *ret;

1618
	ret = apply_refspecs(&remote->fetch, refname);
J
Jeff King 已提交
1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635
	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);

1636
	if (remote->push.nr) {
J
Jeff King 已提交
1637 1638 1639
		char *dst;
		const char *ret;

1640
		dst = apply_refspecs(&remote->push, branch->refname);
J
Jeff King 已提交
1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682
		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;
		}
	}

1683
	BUG("unhandled push situation");
J
Jeff King 已提交
1684 1685 1686 1687
}

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

J
Jeff King 已提交
1691 1692 1693 1694 1695
	if (!branch->push_tracking_ref)
		branch->push_tracking_ref = branch_get_push_1(branch, err);
	return branch->push_tracking_ref;
}

1696 1697 1698 1699
static int ignore_symref_update(const char *refname)
{
	int flag;

1700
	if (!resolve_ref_unsafe(refname, 0, NULL, &flag))
1701 1702 1703 1704
		return 0; /* non-existing refs are OK */
	return (flag & REF_ISSYMREF);
}

1705 1706 1707 1708 1709 1710 1711
/*
 * 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.
 */
1712
static struct ref *get_expanded_map(const struct ref *remote_refs,
1713
				    const struct refspec_item *refspec)
1714
{
1715
	const struct ref *ref;
1716 1717 1718 1719
	struct ref *ret = NULL;
	struct ref **tail = &ret;

	for (ref = remote_refs; ref; ref = ref->next) {
1720 1721
		char *expn_name = NULL;

1722 1723
		if (strchr(ref->name, '^'))
			continue; /* a dereference item */
1724
		if (match_name_with_pattern(refspec->src, ref->name,
1725 1726
					    refspec->dst, &expn_name) &&
		    !ignore_symref_update(expn_name)) {
1727 1728
			struct ref *cpy = copy_ref(ref);

1729
			cpy->peer_ref = alloc_ref(expn_name);
1730 1731 1732 1733 1734
			if (refspec->force)
				cpy->peer_ref->force = 1;
			*tail = cpy;
			tail = &cpy->next;
		}
1735
		free(expn_name);
1736 1737 1738 1739 1740
	}

	return ret;
}

1741
static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
1742
{
1743
	const struct ref *ref;
1744 1745 1746
	const struct ref *best_match = NULL;
	int best_score = 0;

1747
	for (ref = refs; ref; ref = ref->next) {
1748 1749 1750 1751 1752 1753
		int score = refname_match(name, ref->name);

		if (best_score < score) {
			best_match = ref;
			best_score = score;
		}
1754
	}
1755
	return best_match;
1756 1757
}

1758
struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
1759
{
1760
	const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
1761 1762

	if (!ref)
1763
		return NULL;
1764 1765 1766 1767 1768 1769

	return copy_ref(ref);
}

static struct ref *get_local_ref(const char *name)
{
1770
	if (!name || name[0] == '\0')
1771 1772
		return NULL;

1773
	if (starts_with(name, "refs/"))
1774
		return alloc_ref(name);
1775

1776 1777 1778
	if (starts_with(name, "heads/") ||
	    starts_with(name, "tags/") ||
	    starts_with(name, "remotes/"))
R
René Scharfe 已提交
1779
		return alloc_ref_with_prefix("refs/", 5, name);
1780

R
René Scharfe 已提交
1781
	return alloc_ref_with_prefix("refs/heads/", 11, name);
1782 1783
}

1784
int get_fetch_map(const struct ref *remote_refs,
1785
		  const struct refspec_item *refspec,
1786 1787
		  struct ref ***tail,
		  int missing_ok)
1788
{
D
Daniel Barkalow 已提交
1789
	struct ref *ref_map, **rmp;
1790 1791 1792 1793

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

1796 1797
		if (refspec->exact_sha1) {
			ref_map = alloc_ref(name);
1798
			get_oid_hex(name, &ref_map->old_oid);
1799
			ref_map->exact_oid = 1;
1800 1801 1802
		} else {
			ref_map = get_remote_ref(remote_refs, name);
		}
1803 1804 1805 1806 1807 1808 1809
		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;
		}
1810 1811
	}

D
Daniel Barkalow 已提交
1812 1813
	for (rmp = &ref_map; *rmp; ) {
		if ((*rmp)->peer_ref) {
1814
			if (!starts_with((*rmp)->peer_ref->name, "refs/") ||
1815
			    check_refname_format((*rmp)->peer_ref->name, 0)) {
D
Daniel Barkalow 已提交
1816
				struct ref *ignore = *rmp;
1817
				error(_("* Ignoring funny ref '%s' locally"),
D
Daniel Barkalow 已提交
1818 1819 1820 1821 1822 1823 1824 1825
				      (*rmp)->peer_ref->name);
				*rmp = (*rmp)->next;
				free(ignore->peer_ref);
				free(ignore);
				continue;
			}
		}
		rmp = &((*rmp)->next);
1826 1827
	}

1828 1829
	if (ref_map)
		tail_link_ref(ref_map, tail);
1830 1831 1832

	return 0;
}
1833 1834 1835 1836 1837 1838 1839

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)) {
1840
			oidcpy(&ref->old_oid, &list->old_oid);
1841 1842 1843 1844
			return 0;
		}
	return 1;
}
1845 1846

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

1871
	/* Cannot stat unless we are marked to build on top of somebody else. */
1872
	base = branch_get_upstream(branch, NULL);
1873 1874
	if (upstream_name)
		*upstream_name = base;
1875
	if (!base)
1876
		return -1;
1877

1878
	/* Cannot stat if what we used to build on no longer exists */
1879
	if (read_ref(base, &oid))
1880
		return -1;
1881
	theirs = lookup_commit_reference(the_repository, &oid);
1882
	if (!theirs)
1883
		return -1;
1884

1885
	if (read_ref(branch->refname, &oid))
1886
		return -1;
1887
	ours = lookup_commit_reference(the_repository, &oid);
1888
	if (!ours)
1889
		return -1;
1890

1891 1892
	*num_theirs = *num_ours = 0;

1893
	/* are we the same? */
1894
	if (theirs == ours)
1895
		return 0;
1896 1897
	if (abf == AHEAD_BEHIND_QUICK)
		return 1;
1898 1899
	if (abf != AHEAD_BEHIND_FULL)
		BUG("stat_tracking_info: invalid abf '%d'", abf);
1900

1901
	/* Run "rev-list --left-right ours...theirs" internally... */
1902 1903 1904
	argv_array_push(&argv, ""); /* ignored */
	argv_array_push(&argv, "--left-right");
	argv_array_pushf(&argv, "%s...%s",
1905 1906
			 oid_to_hex(&ours->object.oid),
			 oid_to_hex(&theirs->object.oid));
1907
	argv_array_push(&argv, "--");
1908

1909
	repo_init_revisions(the_repository, &revs, NULL);
1910
	setup_revisions(argv.argc, argv.argv, &revs, NULL);
1911 1912
	if (prepare_revision_walk(&revs))
		die("revision walk setup failed");
1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923

	/* ... 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)++;
	}
1924 1925 1926 1927

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

	argv_array_clear(&argv);
1930
	return 1;
1931 1932 1933 1934 1935
}

/*
 * Return true when there is anything to report, otherwise false.
 */
1936 1937
int format_tracking_info(struct branch *branch, struct strbuf *sb,
			 enum ahead_behind_flags abf)
1938
{
1939
	int ours, theirs, sti;
1940
	const char *full_base;
1941
	char *base;
1942
	int upstream_is_gone = 0;
1943

1944 1945
	sti = stat_tracking_info(branch, &ours, &theirs, &full_base, abf);
	if (sti < 0) {
1946 1947
		if (!full_base)
			return 0;
1948 1949
		upstream_is_gone = 1;
	}
1950

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

2008 2009
static int one_local_ref(const char *refname, const struct object_id *oid,
			 int flag, void *cb_data)
2010 2011 2012 2013 2014
{
	struct ref ***local_tail = cb_data;
	struct ref *ref;

	/* we already know it starts with refs/ to get here */
2015
	if (check_refname_format(refname + 5, 0))
2016 2017
		return 0;

2018
	ref = alloc_ref(refname);
2019
	oidcpy(&ref->new_oid, oid);
2020 2021 2022 2023 2024 2025 2026
	**local_tail = ref;
	*local_tail = &ref->next;
	return 0;
}

struct ref *get_local_heads(void)
{
2027
	struct ref *local_refs = NULL, **local_tail = &local_refs;
2028

2029 2030 2031
	for_each_ref(one_local_ref, &local_tail);
	return local_refs;
}
J
Jay Soffian 已提交
2032

2033 2034 2035
struct ref *guess_remote_head(const struct ref *head,
			      const struct ref *refs,
			      int all)
J
Jay Soffian 已提交
2036 2037
{
	const struct ref *r;
2038 2039
	struct ref *list = NULL;
	struct ref **tail = &list;
J
Jay Soffian 已提交
2040

2041
	if (!head)
J
Jay Soffian 已提交
2042 2043
		return NULL;

2044 2045 2046 2047 2048 2049 2050 2051
	/*
	 * 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 已提交
2052
	/* If refs/heads/master could be right, it is. */
2053 2054
	if (!all) {
		r = find_ref_by_name(refs, "refs/heads/master");
J
Jeff King 已提交
2055
		if (r && oideq(&r->old_oid, &head->old_oid))
2056 2057
			return copy_ref(r);
	}
J
Jay Soffian 已提交
2058 2059

	/* Look for another ref that points there */
2060
	for (r = refs; r; r = r->next) {
2061
		if (r != head &&
2062
		    starts_with(r->name, "refs/heads/") &&
J
Jeff King 已提交
2063
		    oideq(&r->old_oid, &head->old_oid)) {
2064 2065 2066 2067 2068 2069
			*tail = copy_ref(r);
			tail = &((*tail)->next);
			if (!all)
				break;
		}
	}
J
Jay Soffian 已提交
2070

2071
	return list;
J
Jay Soffian 已提交
2072
}
2073 2074 2075 2076

struct stale_heads_info {
	struct string_list *ref_names;
	struct ref **stale_refs_tail;
2077
	struct refspec *rs;
2078 2079
};

2080 2081
static int get_stale_heads_cb(const char *refname, const struct object_id *oid,
			      int flags, void *cb_data)
2082 2083
{
	struct stale_heads_info *info = cb_data;
2084
	struct string_list matches = STRING_LIST_INIT_DUP;
2085
	struct refspec_item query;
2086
	int i, stale = 1;
2087
	memset(&query, 0, sizeof(struct refspec_item));
2088 2089
	query.dst = (char *)refname;

2090
	query_refspecs_multiple(info->rs, &query, &matches);
2091 2092
	if (matches.nr == 0)
		goto clean_exit; /* No matches */
2093 2094 2095 2096

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

2113 2114
clean_exit:
	string_list_clear(&matches, 0);
2115 2116 2117
	return 0;
}

2118
struct ref *get_stale_heads(struct refspec *rs, struct ref *fetch_map)
2119 2120
{
	struct ref *ref, *stale_refs = NULL;
2121
	struct string_list ref_names = STRING_LIST_INIT_NODUP;
2122
	struct stale_heads_info info;
2123

2124 2125
	info.ref_names = &ref_names;
	info.stale_refs_tail = &stale_refs;
2126
	info.rs = rs;
2127
	for (ref = fetch_map; ref; ref = ref->next)
2128
		string_list_append(&ref_names, ref->name);
2129
	string_list_sort(&ref_names);
2130 2131 2132 2133
	for_each_ref(get_stale_heads_cb, &info);
	string_list_clear(&ref_names, 0);
	return stale_refs;
}
2134 2135 2136 2137

/*
 * Compare-and-swap
 */
2138
static void clear_cas_option(struct push_cas_option *cas)
2139 2140 2141 2142 2143 2144 2145 2146 2147 2148 2149 2150 2151 2152 2153 2154 2155 2156 2157 2158 2159
{
	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;
}

2160
static int parse_push_cas_option(struct push_cas_option *cas, const char *arg, int unset)
2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 2180 2181
{
	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;
2182
	else if (!colon[1])
2183 2184
		oidclr(&entry->expect);
	else if (get_oid(colon + 1, &entry->expect))
2185
		return error(_("cannot parse expected object name '%s'"), colon + 1);
2186 2187 2188 2189 2190 2191 2192
	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);
}
2193 2194 2195 2196 2197 2198 2199 2200 2201 2202 2203 2204 2205

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,
2206
			   struct object_id *oid)
2207 2208 2209
{
	char *dst;

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

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

	ref->expect_old_sha1 = 1;
2242
	if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
2243
		oidclr(&ref->old_oid_expect);
2244 2245 2246 2247 2248 2249 2250 2251 2252 2253
}

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