remote.c 56.6 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 81
static void add_fetch_refspec(struct remote *remote, const char *ref)
{
D
Daniel Barkalow 已提交
82 83 84 85
	ALLOC_GROW(remote->fetch_refspec,
		   remote->fetch_refspec_nr + 1,
		   remote->fetch_refspec_alloc);
	remote->fetch_refspec[remote->fetch_refspec_nr++] = ref;
86 87
}

88 89 90 91
void add_prune_tags_to_fetch_refspec(struct remote *remote)
{
	int nr = remote->fetch_refspec_nr;
	int bufsize = nr  + 1;
92
	int size = sizeof(struct refspec_item);
93 94 95 96 97 98

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

99
static void add_url(struct remote *remote, const char *url)
100
{
D
Daniel Barkalow 已提交
101 102
	ALLOC_GROW(remote->url, remote->url_nr + 1, remote->url_alloc);
	remote->url[remote->url_nr++] = url;
103 104
}

105 106 107 108 109 110
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;
}

111 112 113 114 115 116 117 118 119 120 121 122 123
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);
}

124 125 126 127 128
struct remotes_hash_key {
	const char *str;
	int len;
};

129
static int remotes_hash_cmp(const void *unused_cmp_data,
130 131 132
			    const void *entry,
			    const void *entry_or_key,
			    const void *keydata)
133
{
134 135 136 137
	const struct remote *a = entry;
	const struct remote *b = entry_or_key;
	const struct remotes_hash_key *key = keydata;

138 139 140 141 142 143 144 145 146
	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)
147
		hashmap_init(&remotes_hash, remotes_hash_cmp, NULL, 0);
148 149
}

150 151
static struct remote *make_remote(const char *name, int len)
{
152 153 154
	struct remote *ret, *replaced;
	struct remotes_hash_key lookup;
	struct hashmap_entry lookup_entry;
155

156 157 158 159 160 161 162 163 164 165
	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;
166

D
Daniel Barkalow 已提交
167
	ret = xcalloc(1, sizeof(struct remote));
168
	ret->prune = -1;  /* unspecified */
169
	ret->prune_tags = -1;  /* unspecified */
170 171 172
	ret->name = xstrndup(name, len);
	refspec_init(&ret->push, REFSPEC_PUSH);

D
Daniel Barkalow 已提交
173 174
	ALLOC_GROW(remotes, remotes_nr + 1, remotes_alloc);
	remotes[remotes_nr++] = ret;
175 176 177 178

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

182 183
static void add_merge(struct branch *branch, const char *name)
{
D
Daniel Barkalow 已提交
184 185 186
	ALLOC_GROW(branch->merge_name, branch->merge_nr + 1,
		   branch->merge_alloc);
	branch->merge_name[branch->merge_nr++] = name;
187 188 189 190
}

static struct branch *make_branch(const char *name, int len)
{
D
Daniel Barkalow 已提交
191 192
	struct branch *ret;
	int i;
193

D
Daniel Barkalow 已提交
194 195 196 197 198
	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];
199 200
	}

D
Daniel Barkalow 已提交
201 202 203
	ALLOC_GROW(branches, branches_nr + 1, branches_alloc);
	ret = xcalloc(1, sizeof(struct branch));
	branches[branches_nr++] = ret;
204
	if (len)
D
Daniel Barkalow 已提交
205
		ret->name = xstrndup(name, len);
206
	else
D
Daniel Barkalow 已提交
207
		ret->name = xstrdup(name);
208
	ret->refname = xstrfmt("refs/heads/%s", ret->name);
209

D
Daniel Barkalow 已提交
210
	return ret;
211 212
}

213
static struct rewrite *make_rewrite(struct rewrites *r, const char *base, int len)
214 215 216 217
{
	struct rewrite *ret;
	int i;

218
	for (i = 0; i < r->rewrite_nr; i++) {
219
		if (len
220 221 222 223
		    ? (len == r->rewrite[i]->baselen &&
		       !strncmp(base, r->rewrite[i]->base, len))
		    : !strcmp(base, r->rewrite[i]->base))
			return r->rewrite[i];
224 225
	}

226
	ALLOC_GROW(r->rewrite, r->rewrite_nr + 1, r->rewrite_alloc);
227
	ret = xcalloc(1, sizeof(struct rewrite));
228
	r->rewrite[r->rewrite_nr++] = ret;
229
	if (len) {
230
		ret->base = xstrndup(base, len);
231 232 233
		ret->baselen = len;
	}
	else {
234
		ret->base = xstrdup(base);
235 236
		ret->baselen = strlen(base);
	}
237 238 239 240 241 242
	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);
243 244 245
	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++;
246 247
}

248 249 250 251 252 253 254
static const char *skip_spaces(const char *s)
{
	while (isspace(*s))
		s++;
	return s;
}

255 256
static void read_remotes_file(struct remote *remote)
{
257
	struct strbuf buf = STRBUF_INIT;
258
	FILE *f = fopen_or_warn(git_path("remotes/%s", remote->name), "r");
259 260 261

	if (!f)
		return;
262
	remote->configured_in_repo = 1;
263
	remote->origin = REMOTE_REMOTES;
264
	while (strbuf_getline(&buf, f) != EOF) {
265
		const char *v;
266

267
		strbuf_rtrim(&buf);
268

269 270 271
		if (skip_prefix(buf.buf, "URL:", &v))
			add_url_alias(remote, xstrdup(skip_spaces(v)));
		else if (skip_prefix(buf.buf, "Push:", &v))
272
			refspec_append(&remote->push, skip_spaces(v));
273 274
		else if (skip_prefix(buf.buf, "Pull:", &v))
			add_fetch_refspec(remote, xstrdup(skip_spaces(v)));
275
	}
276
	strbuf_release(&buf);
277 278 279 280 281
	fclose(f);
}

static void read_branches_file(struct remote *remote)
{
282
	char *frag;
283
	struct strbuf buf = STRBUF_INIT;
284
	FILE *f = fopen_or_warn(git_path("branches/%s", remote->name), "r");
285 286 287

	if (!f)
		return;
288

289
	strbuf_getline_lf(&buf, f);
290
	fclose(f);
291 292 293
	strbuf_trim(&buf);
	if (!buf.len) {
		strbuf_release(&buf);
294
		return;
295 296
	}

297
	remote->configured_in_repo = 1;
298
	remote->origin = REMOTE_BRANCHES;
299 300

	/*
301
	 * The branches file would have URL and optionally
302
	 * #branch specified.  The "master" (or specified) branch is
303 304
	 * fetched and stored in the local branch matching the
	 * remote name.
305
	 */
306 307
	frag = strchr(buf.buf, '#');
	if (frag)
308
		*(frag++) = '\0';
309 310 311 312 313 314
	else
		frag = "master";

	add_url_alias(remote, strbuf_detach(&buf, NULL));
	add_fetch_refspec(remote, xstrfmt("refs/heads/%s:refs/heads/%s",
					  frag, remote->name));
315

316 317 318 319
	/*
	 * Cogito compatible push: push current HEAD to remote #branch
	 * (master if missing)
	 */
320 321
	strbuf_addf(&buf, "HEAD:refs/heads/%s", frag);
	refspec_append(&remote->push, buf.buf);
322
	remote->fetch_tags = 1; /* always auto-follow */
323
	strbuf_release(&buf);
324 325
}

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

T
Thomas Gummerer 已提交
365
	if (parse_config_key(key, "remote", &name, &namelen, &subkey) < 0)
366
		return 0;
367 368

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

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

448 449 450 451
static void alias_all_urls(void)
{
	int i, j;
	for (i = 0; i < remotes_nr; i++) {
452
		int add_pushurl_aliases;
453 454
		if (!remotes[i])
			continue;
455
		for (j = 0; j < remotes[i]->pushurl_nr; j++) {
456
			remotes[i]->pushurl[j] = alias_url(remotes[i]->pushurl[j], &rewrites);
457
		}
458 459 460 461 462 463
		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);
		}
464 465 466
	}
}

467 468
static void read_config(void)
{
469
	static int loaded;
470
	int flag;
471 472

	if (loaded)
473
		return;
474 475
	loaded = 1;

476
	current_branch = NULL;
477
	if (startup_info->have_repository) {
478
		const char *head_ref = resolve_ref_unsafe("HEAD", 0, NULL, &flag);
479 480 481 482
		if (head_ref && (flag & REF_ISSYMREF) &&
		    skip_prefix(head_ref, "refs/heads/", &head_ref)) {
			current_branch = make_branch(head_ref, 0);
		}
483
	}
484
	git_config(handle_config, NULL);
485
	alias_all_urls();
486 487
}

488 489
static int valid_remote_nick(const char *name)
{
490
	if (!name[0] || is_dot_or_dotdot(name))
491
		return 0;
492 493 494 495 496 497

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

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

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

527 528 529 530 531 532 533 534 535 536 537 538 539 540 541
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);

542 543 544
			if (remote && remote->push.nr &&
			    (dst = apply_refspecs(remote->push.items,
						  remote->push.nr,
545 546 547 548 549 550 551 552 553 554 555 556
						  branch->refname))) {
				if (explicit)
					*explicit = 1;
				return dst;
			}
		}
	}
	if (explicit)
		*explicit = 0;
	return "";
}

557 558
static struct remote *remote_get_1(const char *name,
				   const char *(*get_default)(struct branch *, int *))
559 560
{
	struct remote *ret;
561
	int name_given = 0;
562

563 564
	read_config();

565 566
	if (name)
		name_given = 1;
567 568
	else
		name = get_default(current_branch, &name_given);
569

570
	ret = make_remote(name, 0);
571
	if (valid_remote_nick(name) && have_git_dir()) {
572
		if (!valid_remote(ret))
573
			read_remotes_file(ret);
574
		if (!valid_remote(ret))
575 576
			read_branches_file(ret);
	}
577
	if (name_given && !valid_remote(ret))
578
		add_url_alias(ret, name);
579
	if (!valid_remote(ret))
580
		return NULL;
581
	ret->fetch = parse_fetch_refspec(ret->fetch_refspec_nr, ret->fetch_refspec);
582 583
	return ret;
}
584

585 586
struct remote *remote_get(const char *name)
{
587
	return remote_get_1(name, remote_for_branch);
588 589 590 591
}

struct remote *pushremote_get(const char *name)
{
592
	return remote_get_1(name, pushremote_for_branch);
593 594
}

595
int remote_is_configured(struct remote *remote, int in_repo)
596
{
597 598 599 600 601
	if (!remote)
		return 0;
	if (in_repo)
		return remote->configured_in_repo;
	return !!remote->origin;
602 603
}

604 605 606 607
int for_each_remote(each_remote_fn fn, void *priv)
{
	int i, result = 0;
	read_config();
D
Daniel Barkalow 已提交
608
	for (i = 0; i < remotes_nr && !result; i++) {
609 610 611 612
		struct remote *r = remotes[i];
		if (!r)
			continue;
		if (!r->fetch)
613 614
			r->fetch = parse_fetch_refspec(r->fetch_refspec_nr,
						       r->fetch_refspec);
615 616 617 618 619
		result = fn(r, priv);
	}
	return result;
}

620 621
static void handle_duplicate(struct ref *ref1, struct ref *ref2)
{
622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643
	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"));
		}
	}
644 645 646 647
	free(ref2->peer_ref);
	free(ref2);
}

648
struct ref *ref_remove_duplicates(struct ref *ref_map)
649
{
650
	struct string_list refs = STRING_LIST_INIT_NODUP;
651 652
	struct ref *retval = NULL;
	struct ref **p = &retval;
653

654 655 656 657 658
	while (ref_map) {
		struct ref *ref = ref_map;

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

660 661 662
		if (!ref->peer_ref) {
			*p = ref;
			p = &ref->next;
663
		} else {
664 665 666 667 668
			struct string_list_item *item =
				string_list_insert(&refs, ref->peer_ref->name);

			if (item->util) {
				/* Entry already existed */
669
				handle_duplicate((struct ref *)item->util, ref);
670 671 672 673 674
			} else {
				*p = ref;
				p = &ref->next;
				item->util = ref;
			}
675 676
		}
	}
677

678
	string_list_clear(&refs, 0);
679
	return retval;
680 681
}

682
int remote_has_url(struct remote *remote, const char *url)
683 684
{
	int i;
685 686
	for (i = 0; i < remote->url_nr; i++) {
		if (!strcmp(remote->url[i], url))
687 688 689 690 691
			return 1;
	}
	return 0;
}

692 693
static int match_name_with_pattern(const char *key, const char *name,
				   const char *value, char **result)
694
{
D
Daniel Barkalow 已提交
695 696
	const char *kstar = strchr(key, '*');
	size_t klen;
697 698
	size_t ksuffixlen;
	size_t namelen;
D
Daniel Barkalow 已提交
699 700 701 702
	int ret;
	if (!kstar)
		die("Key '%s' of pattern had no '*'", key);
	klen = kstar - key;
703 704 705 706
	ksuffixlen = strlen(kstar + 1);
	namelen = strlen(name);
	ret = !strncmp(name, key, klen) && namelen >= klen + ksuffixlen &&
		!memcmp(name + namelen - ksuffixlen, kstar + 1, ksuffixlen);
707
	if (ret && value) {
708
		struct strbuf sb = STRBUF_INIT;
D
Daniel Barkalow 已提交
709 710 711
		const char *vstar = strchr(value, '*');
		if (!vstar)
			die("Value '%s' of pattern has no '*'", value);
712 713 714 715
		strbuf_add(&sb, value, vstar - value);
		strbuf_add(&sb, name + klen, namelen - klen - ksuffixlen);
		strbuf_addstr(&sb, vstar + 1);
		*result = strbuf_detach(&sb, NULL);
716
	}
717 718 719
	return ret;
}

720
static void query_refspecs_multiple(struct refspec_item *refs, int ref_count, struct refspec_item *query, struct string_list *results)
721 722 723 724 725 726 727 728
{
	int i;
	int find_src = !query->src;

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

	for (i = 0; i < ref_count; i++) {
729
		struct refspec_item *refspec = &refs[i];
730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745
		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);
		}
	}
}

746
int query_refspecs(struct refspec_item *refs, int ref_count, struct refspec_item *query)
747 748
{
	int i;
749
	int find_src = !query->src;
750 751
	const char *needle = find_src ? query->dst : query->src;
	char **result = find_src ? &query->src : &query->dst;
752

753 754
	if (find_src && !query->dst)
		return error("query_refspecs: need either src or dst");
755

756
	for (i = 0; i < ref_count; i++) {
757
		struct refspec_item *refspec = &refs[i];
758 759
		const char *key = find_src ? refspec->dst : refspec->src;
		const char *value = find_src ? refspec->src : refspec->dst;
760

761
		if (!refspec->dst)
762
			continue;
763
		if (refspec->pattern) {
764
			if (match_name_with_pattern(key, needle, value, result)) {
765
				query->force = refspec->force;
766 767
				return 0;
			}
768 769
		} else if (!strcmp(needle, key)) {
			*result = xstrdup(value);
770
			query->force = refspec->force;
771
			return 0;
772 773 774 775 776
		}
	}
	return -1;
}

777
char *apply_refspecs(struct refspec_item *refspecs, int nr_refspec,
778 779
		     const char *name)
{
780
	struct refspec_item query;
781

782
	memset(&query, 0, sizeof(struct refspec_item));
783 784 785 786 787 788 789 790
	query.src = (char *)name;

	if (query_refspecs(refspecs, nr_refspec, &query))
		return NULL;

	return query.dst;
}

791
int remote_find_tracking(struct remote *remote, struct refspec_item *refspec)
792 793 794 795
{
	return query_refspecs(remote->fetch, remote->fetch_refspec_nr, refspec);
}

R
René Scharfe 已提交
796 797 798 799
static struct ref *alloc_ref_with_prefix(const char *prefix, size_t prefixlen,
		const char *name)
{
	size_t len = strlen(name);
800
	struct ref *ref = xcalloc(1, st_add4(sizeof(*ref), prefixlen, len, 1));
R
René Scharfe 已提交
801 802 803 804 805
	memcpy(ref->name, prefix, prefixlen);
	memcpy(ref->name + prefixlen, name, len);
	return ref;
}

806
struct ref *alloc_ref(const char *name)
807
{
808
	return alloc_ref_with_prefix("", 0, name);
809 810
}

J
Jeff King 已提交
811
struct ref *copy_ref(const struct ref *ref)
812
{
813 814 815 816
	struct ref *cpy;
	size_t len;
	if (!ref)
		return NULL;
817 818 819
	len = st_add3(sizeof(struct ref), strlen(ref->name), 1);
	cpy = xmalloc(len);
	memcpy(cpy, ref, len);
820
	cpy->next = NULL;
821 822
	cpy->symref = xstrdup_or_null(ref->symref);
	cpy->remote_status = xstrdup_or_null(ref->remote_status);
823 824
	cpy->peer_ref = copy_ref(ref->peer_ref);
	return cpy;
825 826
}

827 828 829 830 831 832 833 834 835 836 837 838
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;
}

839
static void free_ref(struct ref *ref)
840 841 842
{
	if (!ref)
		return;
843
	free_ref(ref->peer_ref);
844 845 846 847 848
	free(ref->remote_status);
	free(ref->symref);
	free(ref);
}

849 850 851 852 853
void free_refs(struct ref *ref)
{
	struct ref *next;
	while (ref) {
		next = ref->next;
854
		free_ref(ref);
855 856 857 858
		ref = next;
	}
}

859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879
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);
}

880 881 882
int count_refspec_match(const char *pattern,
			struct ref *refs,
			struct ref **matched_ref)
883 884 885 886 887 888 889 890 891 892 893
{
	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);

894
		if (!refname_match(pattern, name))
895 896 897 898 899 900 901 902 903 904 905 906
			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 &&
907 908
		    !starts_with(name, "refs/heads/") &&
		    !starts_with(name, "refs/tags/")) {
909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924
			/* 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) {
925 926
		if (matched_ref)
			*matched_ref = matched_weak;
927 928 929
		return weak_match;
	}
	else {
930 931
		if (matched_ref)
			*matched_ref = matched;
932 933 934 935
		return match;
	}
}

936
static void tail_link_ref(struct ref *ref, struct ref ***tail)
937 938
{
	**tail = ref;
939 940
	while (ref->next)
		ref = ref->next;
941 942 943
	*tail = &ref->next;
}

944 945 946
static struct ref *alloc_delete_ref(void)
{
	struct ref *ref = alloc_ref("(delete)");
947
	oidclr(&ref->new_oid);
948 949 950
	return ref;
}

951 952
static int try_explicit_object_name(const char *name,
				    struct ref **match)
953
{
954
	struct object_id oid;
955

956 957 958 959 960 961
	if (!*name) {
		if (match)
			*match = alloc_delete_ref();
		return 0;
	}

962
	if (get_oid(name, &oid))
963 964 965 966
		return -1;

	if (match) {
		*match = alloc_ref(name);
967
		oidcpy(&(*match)->new_oid, &oid);
968 969
	}
	return 0;
970 971
}

972
static struct ref *make_linked_ref(const char *name, struct ref ***tail)
973
{
974
	struct ref *ret = alloc_ref(name);
975 976
	tail_link_ref(ret, tail);
	return ret;
977
}
978

979 980 981 982
static char *guess_ref(const char *name, struct ref *peer)
{
	struct strbuf buf = STRBUF_INIT;

983
	const char *r = resolve_ref_unsafe(peer->name, RESOLVE_REF_READING,
984
					   NULL, NULL);
985 986 987
	if (!r)
		return NULL;

988
	if (starts_with(r, "refs/heads/"))
989
		strbuf_addstr(&buf, "refs/heads/");
990
	else if (starts_with(r, "refs/tags/"))
991 992 993 994 995 996 997 998
		strbuf_addstr(&buf, "refs/tags/");
	else
		return NULL;

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

999
static int match_explicit_lhs(struct ref *src,
1000
			      struct refspec_item *rs,
1001 1002 1003 1004 1005
			      struct ref **match,
			      int *allocated_match)
{
	switch (count_refspec_match(rs->src, src, match)) {
	case 1:
1006 1007
		if (allocated_match)
			*allocated_match = 0;
1008 1009 1010 1011 1012 1013
		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.
		 */
1014
		if (try_explicit_object_name(rs->src, match) < 0)
1015
			return error("src refspec %s does not match any.", rs->src);
1016 1017
		if (allocated_match)
			*allocated_match = 1;
1018 1019 1020 1021 1022 1023
		return 0;
	default:
		return error("src refspec %s matches more than one.", rs->src);
	}
}

1024 1025
static int match_explicit(struct ref *src, struct ref *dst,
			  struct ref ***dst_tail,
1026
			  struct refspec_item *rs)
1027
{
1028
	struct ref *matched_src, *matched_dst;
1029
	int allocated_src;
1030

1031
	const char *dst_value = rs->dst;
1032
	char *dst_guess;
1033

1034
	if (rs->pattern || rs->matching)
1035
		return 0;
1036

1037
	matched_src = matched_dst = NULL;
1038 1039
	if (match_explicit_lhs(src, rs, &matched_src, &allocated_src) < 0)
		return -1;
1040

1041
	if (!dst_value) {
1042 1043
		int flag;

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

1054 1055 1056 1057
	switch (count_refspec_match(dst_value, dst, &matched_dst)) {
	case 1:
		break;
	case 0:
1058
		if (starts_with(dst_value, "refs/"))
1059
			matched_dst = make_linked_ref(dst_value, dst_tail);
1060
		else if (is_null_oid(&matched_src->new_oid))
1061 1062
			error("unable to delete '%s': remote ref does not exist",
			      dst_value);
1063
		else if ((dst_guess = guess_ref(dst_value, matched_src))) {
1064
			matched_dst = make_linked_ref(dst_guess, dst_tail);
1065 1066
			free(dst_guess);
		} else
1067 1068 1069 1070 1071 1072
			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);
1073 1074
		break;
	default:
1075
		matched_dst = NULL;
1076 1077 1078 1079
		error("dst refspec %s matches more than one.",
		      dst_value);
		break;
	}
1080 1081 1082 1083
	if (!matched_dst)
		return -1;
	if (matched_dst->peer_ref)
		return error("dst ref %s receives from more than one src.",
1084 1085
		      matched_dst->name);
	else {
1086 1087 1088
		matched_dst->peer_ref = allocated_src ?
					matched_src :
					copy_ref(matched_src);
1089
		matched_dst->force = rs->force;
1090
	}
1091
	return 0;
1092 1093 1094
}

static int match_explicit_refs(struct ref *src, struct ref *dst,
1095
			       struct ref ***dst_tail, struct refspec_item *rs,
1096 1097 1098 1099
			       int rs_nr)
{
	int i, errs;
	for (i = errs = 0; i < rs_nr; i++)
1100 1101
		errs += match_explicit(src, dst, dst_tail, &rs[i]);
	return errs;
1102 1103
}

1104 1105
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)
1106
{
1107
	const struct refspec_item *pat;
1108
	char *name;
1109
	int i;
1110
	int matching_refs = -1;
1111
	for (i = 0; i < rs_nr; i++) {
1112 1113 1114 1115 1116 1117
		if (rs[i].matching &&
		    (matching_refs == -1 || rs[i].force)) {
			matching_refs = i;
			continue;
		}

1118 1119
		if (rs[i].pattern) {
			const char *dst_side = rs[i].dst ? rs[i].dst : rs[i].src;
F
Felipe Contreras 已提交
1120 1121 1122 1123 1124 1125
			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) {
1126 1127 1128 1129
				matching_refs = i;
				break;
			}
		}
1130
	}
1131
	if (matching_refs == -1)
1132
		return NULL;
1133 1134 1135 1136 1137 1138 1139 1140

	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.
		 */
1141
		if (!send_mirror && !starts_with(ref->name, "refs/heads/"))
1142 1143 1144 1145 1146 1147
			return NULL;
		name = xstrdup(ref->name);
	}
	if (ret_pat)
		*ret_pat = pat;
	return name;
1148 1149
}

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

J
Junio C Hamano 已提交
1158 1159 1160 1161 1162
struct tips {
	struct commit **tip;
	int nr, alloc;
};

1163
static void add_to_tips(struct tips *tips, const struct object_id *oid)
J
Junio C Hamano 已提交
1164 1165 1166
{
	struct commit *commit;

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

1201
	string_list_sort(&dst_tag);
J
Junio C Hamano 已提交
1202 1203 1204

	/* Collect tags they do not have. */
	for (ref = src; ref; ref = ref->next) {
1205
		if (!starts_with(ref->name, "refs/tags/"))
J
Junio C Hamano 已提交
1206 1207 1208
			continue; /* not a tag */
		if (string_list_has_string(&dst_tag, ref->name))
			continue; /* they already have it */
1209
		if (oid_object_info(&ref->new_oid, NULL) != OBJ_TAG)
J
Junio C Hamano 已提交
1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228
			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;

1229
			if (is_null_oid(&ref->new_oid))
J
Junio C Hamano 已提交
1230
				continue;
1231 1232
			commit = lookup_commit_reference_gently(&ref->new_oid,
								1);
J
Junio C Hamano 已提交
1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245
			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);
1246
			oidcpy(&dst_ref->new_oid, &ref->new_oid);
J
Junio C Hamano 已提交
1247 1248 1249 1250 1251 1252 1253
			dst_ref->peer_ref = copy_ref(ref);
		}
	}
	string_list_clear(&src_tag, 0);
	free(sent_tips.tip);
}

1254 1255 1256 1257 1258 1259 1260 1261
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;
}

1262 1263 1264 1265 1266
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;

1267
	string_list_sort(ref_index);
1268 1269
}

1270 1271 1272 1273 1274 1275 1276 1277
/*
 * 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)
{
1278
	struct refspec refspec = REFSPEC_INIT_PUSH;
1279 1280 1281
	int ret = 0;
	int i;

1282 1283 1284 1285
	refspec_appendn(&refspec, refspec_names, nr_refspec);

	for (i = 0; i < refspec.nr; i++) {
		struct refspec_item *rs = &refspec.items[i];
1286 1287 1288 1289 1290 1291 1292

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

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

1293
	refspec_clear(&refspec);
1294 1295 1296
	return ret;
}

1297
/*
1298 1299 1300 1301 1302 1303
 * 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).
1304
 */
1305 1306
int match_push_refs(struct ref *src, struct ref **dst,
		    int nr_refspec, const char **refspec, int flags)
1307
{
1308
	struct refspec rs = REFSPEC_INIT_PUSH;
A
Andy Whitcroft 已提交
1309 1310
	int send_all = flags & MATCH_REFS_ALL;
	int send_mirror = flags & MATCH_REFS_MIRROR;
F
Felipe Contreras 已提交
1311
	int send_prune = flags & MATCH_REFS_PRUNE;
1312
	int errs;
1313
	static const char *default_refspec[] = { ":", NULL };
1314
	struct ref *ref, **dst_tail = tail_ref(dst);
1315
	struct string_list dst_ref_index = STRING_LIST_INIT_NODUP;
1316

1317 1318 1319 1320
	if (!nr_refspec) {
		nr_refspec = 1;
		refspec = default_refspec;
	}
1321 1322
	refspec_appendn(&rs, refspec, nr_refspec);
	errs = match_explicit_refs(src, *dst, &dst_tail, rs.items, rs.nr);
1323 1324

	/* pick the remainder */
1325
	for (ref = src; ref; ref = ref->next) {
1326
		struct string_list_item *dst_item;
1327
		struct ref *dst_peer;
1328
		const struct refspec_item *pat = NULL;
1329
		char *dst_name;
1330

1331
		dst_name = get_ref_match(rs.items, rs.nr, ref, send_mirror, FROM_SRC, &pat);
1332
		if (!dst_name)
1333 1334
			continue;

1335 1336 1337 1338 1339
		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;
1340 1341 1342 1343 1344 1345 1346 1347 1348
		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 已提交
1349
				 * --all or --mirror.
1350 1351
				 */
				goto free_name;
A
Andy Whitcroft 已提交
1352

1353
			/* Create a new one and link it */
1354
			dst_peer = make_linked_ref(dst_name, &dst_tail);
1355
			oidcpy(&dst_peer->new_oid, &ref->new_oid);
1356 1357
			string_list_insert(&dst_ref_index,
				dst_peer->name)->util = dst_peer;
1358
		}
1359
		dst_peer->peer_ref = copy_ref(ref);
1360
		dst_peer->force = pat->force;
1361 1362
	free_name:
		free(dst_name);
1363
	}
J
Junio C Hamano 已提交
1364

1365 1366
	string_list_clear(&dst_ref_index, 0);

J
Junio C Hamano 已提交
1367 1368 1369
	if (flags & MATCH_REFS_FOLLOW_TAGS)
		add_missing_tags(src, dst, &dst_tail);

F
Felipe Contreras 已提交
1370
	if (send_prune) {
1371
		struct string_list src_ref_index = STRING_LIST_INIT_NODUP;
F
Felipe Contreras 已提交
1372 1373 1374 1375 1376 1377 1378 1379
		/* 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;

1380
			src_name = get_ref_match(rs.items, rs.nr, ref, send_mirror, FROM_DST, NULL);
F
Felipe Contreras 已提交
1381
			if (src_name) {
1382 1383 1384 1385
				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 已提交
1386 1387 1388 1389
					ref->peer_ref = alloc_delete_ref();
				free(src_name);
			}
		}
1390
		string_list_clear(&src_ref_index, 0);
F
Felipe Contreras 已提交
1391
	}
1392 1393 1394

	refspec_clear(&rs);

1395 1396
	if (errs)
		return -1;
1397 1398
	return 0;
}
1399

1400
void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
1401
			     int force_update)
1402 1403 1404 1405
{
	struct ref *ref;

	for (ref = remote_refs; ref; ref = ref->next) {
1406
		int force_ref_update = ref->force || force_update;
1407
		int reject_reason = 0;
1408

1409
		if (ref->peer_ref)
1410
			oidcpy(&ref->new_oid, &ref->peer_ref->new_oid);
1411 1412 1413
		else if (!send_mirror)
			continue;

1414
		ref->deletion = is_null_oid(&ref->new_oid);
1415
		if (!ref->deletion &&
1416
			!oidcmp(&ref->old_oid, &ref->new_oid)) {
1417 1418 1419 1420
			ref->status = REF_STATUS_UPTODATE;
			continue;
		}

C
Chris Rorvick 已提交
1421
		/*
1422 1423
		 * If the remote ref has moved and is now different
		 * from what we expect, reject any push.
1424 1425 1426 1427 1428 1429 1430
		 *
		 * 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) {
1431
			if (oidcmp(&ref->old_oid, &ref->old_oid_expect))
1432
				reject_reason = REF_STATUS_REJECT_STALE;
1433 1434 1435
			else
				/* If the ref isn't stale then force the update. */
				force_ref_update = 1;
1436 1437 1438
		}

		/*
1439 1440
		 * If the update isn't already rejected then check
		 * the usual "must fast-forward" rules.
1441
		 *
1442 1443 1444
		 * Decide whether an individual refspec A:B can be
		 * pushed.  The push will succeed if any of the
		 * following are true:
1445
		 *
C
Chris Rorvick 已提交
1446
		 * (1) the remote reference B does not exist
1447
		 *
C
Chris Rorvick 已提交
1448 1449
		 * (2) the remote reference B is being removed (i.e.,
		 *     pushing :B where no source is specified)
1450
		 *
1451 1452 1453
		 * (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.
1454
		 *
C
Chris Rorvick 已提交
1455 1456
		 * (4) it is forced using the +A:B notation, or by
		 *     passing the --force argument
1457 1458
		 */

1459
		if (!reject_reason && !ref->deletion && !is_null_oid(&ref->old_oid)) {
1460
			if (starts_with(ref->name, "refs/tags/"))
1461
				reject_reason = REF_STATUS_REJECT_ALREADY_EXISTS;
1462
			else if (!has_object_file(&ref->old_oid))
1463
				reject_reason = REF_STATUS_REJECT_FETCH_FIRST;
1464 1465
			else if (!lookup_commit_reference_gently(&ref->old_oid, 1) ||
				 !lookup_commit_reference_gently(&ref->new_oid, 1))
1466
				reject_reason = REF_STATUS_REJECT_NEEDS_FORCE;
1467
			else if (!ref_newer(&ref->new_oid, &ref->old_oid))
1468
				reject_reason = REF_STATUS_REJECT_NONFASTFORWARD;
1469
		}
1470 1471 1472 1473 1474 1475 1476 1477 1478

		/*
		 * "--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;
1479 1480 1481
	}
}

1482 1483
static void set_merge(struct branch *ret)
{
1484
	struct remote *remote;
1485
	char *ref;
1486
	struct object_id oid;
1487 1488
	int i;

1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501
	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;
	}

1502 1503
	remote = remote_get(ret->remote_name);

1504 1505 1506 1507
	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]);
1508
		if (!remote_find_tracking(remote, ret->merge[i]) ||
1509 1510 1511
		    strcmp(ret->remote_name, "."))
			continue;
		if (dwim_ref(ret->merge_name[i], strlen(ret->merge_name[i]),
1512
			     &oid, &ref) == 1)
1513 1514 1515 1516 1517 1518
			ret->merge[i]->dst = ref;
		else
			ret->merge[i]->dst = xstrdup(ret->merge_name[i]);
	}
}

1519 1520 1521 1522 1523 1524 1525 1526 1527
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);
1528
	set_merge(ret);
1529 1530 1531 1532 1533 1534 1535 1536
	return ret;
}

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

1537 1538 1539
int branch_merge_matches(struct branch *branch,
		                 int i,
		                 const char *refname)
1540
{
1541
	if (!branch || i < 0 || i >= branch->merge_nr)
1542
		return 0;
1543
	return refname_match(branch->merge[i]->src, refname);
1544
}
1545

1546
__attribute__((format (printf,2,3)))
1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561
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"));
1562 1563 1564 1565 1566 1567 1568

	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?
		 */
1569 1570 1571
		if (!ref_exists(branch->refname))
			return error_buf(err, _("no such branch: '%s'"),
					 branch->name);
1572 1573 1574 1575 1576 1577
		return error_buf(err,
				 _("no upstream configured for branch '%s'"),
				 branch->name);
	}

	if (!branch->merge[0]->dst)
1578 1579 1580 1581
		return error_buf(err,
				 _("upstream branch '%s' not stored as a remote-tracking branch"),
				 branch->merge[0]->src);

1582 1583 1584
	return branch->merge[0]->dst;
}

J
Jeff King 已提交
1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608
static const char *tracking_for_push_dest(struct remote *remote,
					  const char *refname,
					  struct strbuf *err)
{
	char *ret;

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

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

	remote = remote_get(pushremote_for_branch(branch, NULL));
	if (!remote)
		return error_buf(err,
				 _("branch '%s' has no remote for pushing"),
				 branch->name);

1609
	if (remote->push.nr) {
J
Jeff King 已提交
1610 1611 1612
		char *dst;
		const char *ret;

1613
		dst = apply_refspecs(remote->push.items, remote->push.nr,
J
Jeff King 已提交
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 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661
				     branch->refname);
		if (!dst)
			return error_buf(err,
					 _("push refspecs for '%s' do not include '%s'"),
					 remote->name, branch->name);

		ret = tracking_for_push_dest(remote, dst, err);
		free(dst);
		return ret;
	}

	if (remote->mirror)
		return tracking_for_push_dest(remote, branch->refname, err);

	switch (push_default) {
	case PUSH_DEFAULT_NOTHING:
		return error_buf(err, _("push has no destination (push.default is 'nothing')"));

	case PUSH_DEFAULT_MATCHING:
	case PUSH_DEFAULT_CURRENT:
		return tracking_for_push_dest(remote, branch->refname, err);

	case PUSH_DEFAULT_UPSTREAM:
		return branch_get_upstream(branch, err);

	case PUSH_DEFAULT_UNSPECIFIED:
	case PUSH_DEFAULT_SIMPLE:
		{
			const char *up, *cur;

			up = branch_get_upstream(branch, err);
			if (!up)
				return NULL;
			cur = tracking_for_push_dest(remote, branch->refname, err);
			if (!cur)
				return NULL;
			if (strcmp(cur, up))
				return error_buf(err,
						 _("cannot resolve 'simple' push to a single destination"));
			return cur;
		}
	}

	die("BUG: unhandled push situation");
}

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

J
Jeff King 已提交
1665 1666 1667 1668 1669
	if (!branch->push_tracking_ref)
		branch->push_tracking_ref = branch_get_push_1(branch, err);
	return branch->push_tracking_ref;
}

1670 1671 1672 1673
static int ignore_symref_update(const char *refname)
{
	int flag;

1674
	if (!resolve_ref_unsafe(refname, 0, NULL, &flag))
1675 1676 1677 1678
		return 0; /* non-existing refs are OK */
	return (flag & REF_ISSYMREF);
}

1679 1680 1681 1682 1683 1684 1685
/*
 * 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.
 */
1686
static struct ref *get_expanded_map(const struct ref *remote_refs,
1687
				    const struct refspec_item *refspec)
1688
{
1689
	const struct ref *ref;
1690 1691 1692 1693
	struct ref *ret = NULL;
	struct ref **tail = &ret;

	for (ref = remote_refs; ref; ref = ref->next) {
1694 1695
		char *expn_name = NULL;

1696 1697
		if (strchr(ref->name, '^'))
			continue; /* a dereference item */
1698
		if (match_name_with_pattern(refspec->src, ref->name,
1699 1700
					    refspec->dst, &expn_name) &&
		    !ignore_symref_update(expn_name)) {
1701 1702
			struct ref *cpy = copy_ref(ref);

1703
			cpy->peer_ref = alloc_ref(expn_name);
1704 1705 1706 1707 1708
			if (refspec->force)
				cpy->peer_ref->force = 1;
			*tail = cpy;
			tail = &cpy->next;
		}
1709
		free(expn_name);
1710 1711 1712 1713 1714
	}

	return ret;
}

1715
static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
1716
{
1717
	const struct ref *ref;
1718
	for (ref = refs; ref; ref = ref->next) {
1719
		if (refname_match(name, ref->name))
1720 1721 1722 1723 1724
			return ref;
	}
	return NULL;
}

1725
struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
1726
{
1727
	const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
1728 1729

	if (!ref)
1730
		return NULL;
1731 1732 1733 1734 1735 1736

	return copy_ref(ref);
}

static struct ref *get_local_ref(const char *name)
{
1737
	if (!name || name[0] == '\0')
1738 1739
		return NULL;

1740
	if (starts_with(name, "refs/"))
1741
		return alloc_ref(name);
1742

1743 1744 1745
	if (starts_with(name, "heads/") ||
	    starts_with(name, "tags/") ||
	    starts_with(name, "remotes/"))
R
René Scharfe 已提交
1746
		return alloc_ref_with_prefix("refs/", 5, name);
1747

R
René Scharfe 已提交
1748
	return alloc_ref_with_prefix("refs/heads/", 11, name);
1749 1750
}

1751
int get_fetch_map(const struct ref *remote_refs,
1752
		  const struct refspec_item *refspec,
1753 1754
		  struct ref ***tail,
		  int missing_ok)
1755
{
D
Daniel Barkalow 已提交
1756
	struct ref *ref_map, **rmp;
1757 1758 1759 1760

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

1763 1764
		if (refspec->exact_sha1) {
			ref_map = alloc_ref(name);
1765
			get_oid_hex(name, &ref_map->old_oid);
1766 1767 1768
		} else {
			ref_map = get_remote_ref(remote_refs, name);
		}
1769 1770 1771 1772 1773 1774 1775
		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;
		}
1776 1777
	}

D
Daniel Barkalow 已提交
1778 1779
	for (rmp = &ref_map; *rmp; ) {
		if ((*rmp)->peer_ref) {
1780
			if (!starts_with((*rmp)->peer_ref->name, "refs/") ||
1781
			    check_refname_format((*rmp)->peer_ref->name, 0)) {
D
Daniel Barkalow 已提交
1782 1783 1784 1785 1786 1787 1788 1789 1790 1791
				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);
1792 1793
	}

1794 1795
	if (ref_map)
		tail_link_ref(ref_map, tail);
1796 1797 1798

	return 0;
}
1799 1800 1801 1802 1803 1804 1805

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)) {
1806
			oidcpy(&ref->old_oid, &list->old_oid);
1807 1808 1809 1810
			return 0;
		}
	return 1;
}
1811

1812 1813 1814
static void unmark_and_free(struct commit_list *list, unsigned int mark)
{
	while (list) {
1815 1816
		struct commit *commit = pop_commit(&list);
		commit->object.flags &= ~mark;
1817 1818 1819
	}
}

1820
int ref_newer(const struct object_id *new_oid, const struct object_id *old_oid)
1821 1822
{
	struct object *o;
1823
	struct commit *old_commit, *new_commit;
1824 1825 1826
	struct commit_list *list, *used;
	int found = 0;

1827
	/*
1828 1829
	 * Both new_commit and old_commit must be commit-ish and new_commit is descendant of
	 * old_commit.  Otherwise we require --force.
1830
	 */
1831
	o = deref_tag(parse_object(old_oid), NULL, 0);
1832 1833
	if (!o || o->type != OBJ_COMMIT)
		return 0;
1834
	old_commit = (struct commit *) o;
1835

1836
	o = deref_tag(parse_object(new_oid), NULL, 0);
1837 1838
	if (!o || o->type != OBJ_COMMIT)
		return 0;
1839
	new_commit = (struct commit *) o;
1840

1841
	if (parse_commit(new_commit) < 0)
1842 1843 1844
		return 0;

	used = list = NULL;
1845
	commit_list_insert(new_commit, &list);
1846
	while (list) {
1847 1848 1849
		new_commit = pop_most_recent_commit(&list, TMP_MARK);
		commit_list_insert(new_commit, &used);
		if (new_commit == old_commit) {
1850 1851 1852 1853 1854 1855 1856 1857 1858
			found = 1;
			break;
		}
	}
	unmark_and_free(list, TMP_MARK);
	unmark_and_free(used, TMP_MARK);
	return found;
}

1859
/*
1860 1861 1862 1863 1864 1865 1866 1867 1868 1869
 * 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.
1870
 *
1871
 * Returns -1 if num_ours and num_theirs could not be filled in (e.g., no
1872 1873
 * upstream defined, or ref does not exist).  Returns 0 if the commits are
 * identical.  Returns 1 if commits are different.
1874
 */
1875
int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs,
1876
		       const char **upstream_name, enum ahead_behind_flags abf)
1877
{
1878
	struct object_id oid;
1879 1880
	struct commit *ours, *theirs;
	struct rev_info revs;
1881 1882
	const char *base;
	struct argv_array argv = ARGV_ARRAY_INIT;
1883

1884
	/* Cannot stat unless we are marked to build on top of somebody else. */
1885
	base = branch_get_upstream(branch, NULL);
1886 1887
	if (upstream_name)
		*upstream_name = base;
1888
	if (!base)
1889
		return -1;
1890

1891
	/* Cannot stat if what we used to build on no longer exists */
1892
	if (read_ref(base, &oid))
1893
		return -1;
1894
	theirs = lookup_commit_reference(&oid);
1895
	if (!theirs)
1896
		return -1;
1897

1898
	if (read_ref(branch->refname, &oid))
1899
		return -1;
1900
	ours = lookup_commit_reference(&oid);
1901
	if (!ours)
1902
		return -1;
1903

1904 1905
	*num_theirs = *num_ours = 0;

1906
	/* are we the same? */
1907
	if (theirs == ours)
1908
		return 0;
1909 1910
	if (abf == AHEAD_BEHIND_QUICK)
		return 1;
1911 1912
	if (abf != AHEAD_BEHIND_FULL)
		BUG("stat_tracking_info: invalid abf '%d'", abf);
1913

1914
	/* Run "rev-list --left-right ours...theirs" internally... */
1915 1916 1917
	argv_array_push(&argv, ""); /* ignored */
	argv_array_push(&argv, "--left-right");
	argv_array_pushf(&argv, "%s...%s",
1918 1919
			 oid_to_hex(&ours->object.oid),
			 oid_to_hex(&theirs->object.oid));
1920
	argv_array_push(&argv, "--");
1921 1922

	init_revisions(&revs, NULL);
1923
	setup_revisions(argv.argc, argv.argv, &revs, NULL);
1924 1925
	if (prepare_revision_walk(&revs))
		die("revision walk setup failed");
1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936

	/* ... 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)++;
	}
1937 1938 1939 1940

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

	argv_array_clear(&argv);
1943
	return 1;
1944 1945 1946 1947 1948
}

/*
 * Return true when there is anything to report, otherwise false.
 */
1949 1950
int format_tracking_info(struct branch *branch, struct strbuf *sb,
			 enum ahead_behind_flags abf)
1951
{
1952
	int ours, theirs, sti;
1953
	const char *full_base;
1954
	char *base;
1955
	int upstream_is_gone = 0;
1956

1957 1958
	sti = stat_tracking_info(branch, &ours, &theirs, &full_base, abf);
	if (sti < 0) {
1959 1960
		if (!full_base)
			return 0;
1961 1962
		upstream_is_gone = 1;
	}
1963

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

2021 2022
static int one_local_ref(const char *refname, const struct object_id *oid,
			 int flag, void *cb_data)
2023 2024 2025 2026 2027
{
	struct ref ***local_tail = cb_data;
	struct ref *ref;

	/* we already know it starts with refs/ to get here */
2028
	if (check_refname_format(refname + 5, 0))
2029 2030
		return 0;

2031
	ref = alloc_ref(refname);
2032
	oidcpy(&ref->new_oid, oid);
2033 2034 2035 2036 2037 2038 2039
	**local_tail = ref;
	*local_tail = &ref->next;
	return 0;
}

struct ref *get_local_heads(void)
{
2040
	struct ref *local_refs = NULL, **local_tail = &local_refs;
2041

2042 2043 2044
	for_each_ref(one_local_ref, &local_tail);
	return local_refs;
}
J
Jay Soffian 已提交
2045

2046 2047 2048
struct ref *guess_remote_head(const struct ref *head,
			      const struct ref *refs,
			      int all)
J
Jay Soffian 已提交
2049 2050
{
	const struct ref *r;
2051 2052
	struct ref *list = NULL;
	struct ref **tail = &list;
J
Jay Soffian 已提交
2053

2054
	if (!head)
J
Jay Soffian 已提交
2055 2056
		return NULL;

2057 2058 2059 2060 2061 2062 2063 2064
	/*
	 * 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 已提交
2065
	/* If refs/heads/master could be right, it is. */
2066 2067
	if (!all) {
		r = find_ref_by_name(refs, "refs/heads/master");
2068
		if (r && !oidcmp(&r->old_oid, &head->old_oid))
2069 2070
			return copy_ref(r);
	}
J
Jay Soffian 已提交
2071 2072

	/* Look for another ref that points there */
2073
	for (r = refs; r; r = r->next) {
2074
		if (r != head &&
2075
		    starts_with(r->name, "refs/heads/") &&
2076
		    !oidcmp(&r->old_oid, &head->old_oid)) {
2077 2078 2079 2080 2081 2082
			*tail = copy_ref(r);
			tail = &((*tail)->next);
			if (!all)
				break;
		}
	}
J
Jay Soffian 已提交
2083

2084
	return list;
J
Jay Soffian 已提交
2085
}
2086 2087 2088 2089

struct stale_heads_info {
	struct string_list *ref_names;
	struct ref **stale_refs_tail;
2090
	struct refspec_item *refs;
2091
	int ref_count;
2092 2093
};

2094 2095
static int get_stale_heads_cb(const char *refname, const struct object_id *oid,
			      int flags, void *cb_data)
2096 2097
{
	struct stale_heads_info *info = cb_data;
2098
	struct string_list matches = STRING_LIST_INIT_DUP;
2099
	struct refspec_item query;
2100
	int i, stale = 1;
2101
	memset(&query, 0, sizeof(struct refspec_item));
2102 2103
	query.dst = (char *)refname;

2104 2105 2106
	query_refspecs_multiple(info->refs, info->ref_count, &query, &matches);
	if (matches.nr == 0)
		goto clean_exit; /* No matches */
2107 2108 2109 2110

	/*
	 * 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
2111 2112 2113
	 * remote, we consider it to be stale. In order to deal with
	 * overlapping refspecs, we need to go over all of the
	 * matching refs.
2114
	 */
2115 2116 2117 2118 2119 2120 2121 2122
	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) {
2123
		struct ref *ref = make_linked_ref(refname, &info->stale_refs_tail);
2124
		oidcpy(&ref->new_oid, oid);
2125
	}
2126

2127 2128
clean_exit:
	string_list_clear(&matches, 0);
2129 2130 2131
	return 0;
}

2132
struct ref *get_stale_heads(struct refspec_item *refs, int ref_count, struct ref *fetch_map)
2133 2134
{
	struct ref *ref, *stale_refs = NULL;
2135
	struct string_list ref_names = STRING_LIST_INIT_NODUP;
2136
	struct stale_heads_info info;
2137

2138 2139
	info.ref_names = &ref_names;
	info.stale_refs_tail = &stale_refs;
2140 2141
	info.refs = refs;
	info.ref_count = ref_count;
2142
	for (ref = fetch_map; ref; ref = ref->next)
2143
		string_list_append(&ref_names, ref->name);
2144
	string_list_sort(&ref_names);
2145 2146 2147 2148
	for_each_ref(get_stale_heads_cb, &info);
	string_list_clear(&ref_names, 0);
	return stale_refs;
}
2149 2150 2151 2152

/*
 * Compare-and-swap
 */
2153
static void clear_cas_option(struct push_cas_option *cas)
2154 2155 2156 2157 2158 2159 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174
{
	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;
}

2175
static int parse_push_cas_option(struct push_cas_option *cas, const char *arg, int unset)
2176 2177 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 2190 2191 2192 2193 2194 2195 2196
{
	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;
2197
	else if (!colon[1])
2198 2199
		oidclr(&entry->expect);
	else if (get_oid(colon + 1, &entry->expect))
2200 2201 2202 2203 2204 2205 2206 2207
		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);
}
2208 2209 2210 2211 2212 2213 2214 2215 2216 2217 2218 2219 2220

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,
2221
			   struct object_id *oid)
2222 2223 2224 2225 2226 2227
{
	char *dst;

	dst = apply_refspecs(remote->fetch, remote->fetch_refspec_nr, refname);
	if (!dst)
		return -1; /* no tracking ref for refname at remote */
2228
	if (read_ref(dst, oid))
2229 2230 2231 2232 2233 2234 2235 2236 2237 2238 2239 2240 2241
		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];
2242
		if (!refname_match(entry->refname, ref->name))
2243 2244 2245
			continue;
		ref->expect_old_sha1 = 1;
		if (!entry->use_tracking)
2246
			oidcpy(&ref->old_oid_expect, &entry->expect);
2247
		else if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
2248
			oidclr(&ref->old_oid_expect);
2249 2250 2251 2252 2253 2254 2255 2256
		return;
	}

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

	ref->expect_old_sha1 = 1;
2257
	if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
2258
		oidclr(&ref->old_oid_expect);
2259 2260 2261 2262 2263 2264 2265 2266 2267 2268
}

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