remote.c 56.9 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_push_refspec(struct remote *remote, const char *ref)
{
D
Daniel Barkalow 已提交
82 83 84 85
	ALLOC_GROW(remote->push_refspec,
		   remote->push_refspec_nr + 1,
		   remote->push_refspec_alloc);
	remote->push_refspec[remote->push_refspec_nr++] = ref;
86 87
}

88 89
static void add_fetch_refspec(struct remote *remote, const char *ref)
{
D
Daniel Barkalow 已提交
90 91 92 93
	ALLOC_GROW(remote->fetch_refspec,
		   remote->fetch_refspec_nr + 1,
		   remote->fetch_refspec_alloc);
	remote->fetch_refspec[remote->fetch_refspec_nr++] = ref;
94 95
}

96 97 98 99
void add_prune_tags_to_fetch_refspec(struct remote *remote)
{
	int nr = remote->fetch_refspec_nr;
	int bufsize = nr  + 1;
100
	int size = sizeof(struct refspec_item);
101 102 103 104 105 106

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

107
static void add_url(struct remote *remote, const char *url)
108
{
D
Daniel Barkalow 已提交
109 110
	ALLOC_GROW(remote->url, remote->url_nr + 1, remote->url_alloc);
	remote->url[remote->url_nr++] = url;
111 112
}

113 114 115 116 117 118
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;
}

119 120 121 122 123 124 125 126 127 128 129 130 131
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);
}

132 133 134 135 136
struct remotes_hash_key {
	const char *str;
	int len;
};

137
static int remotes_hash_cmp(const void *unused_cmp_data,
138 139 140
			    const void *entry,
			    const void *entry_or_key,
			    const void *keydata)
141
{
142 143 144 145
	const struct remote *a = entry;
	const struct remote *b = entry_or_key;
	const struct remotes_hash_key *key = keydata;

146 147 148 149 150 151 152 153 154
	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)
155
		hashmap_init(&remotes_hash, remotes_hash_cmp, NULL, 0);
156 157
}

158 159
static struct remote *make_remote(const char *name, int len)
{
160 161 162
	struct remote *ret, *replaced;
	struct remotes_hash_key lookup;
	struct hashmap_entry lookup_entry;
163

164 165 166 167 168 169 170 171 172 173
	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;
174

D
Daniel Barkalow 已提交
175
	ret = xcalloc(1, sizeof(struct remote));
176
	ret->prune = -1;  /* unspecified */
177
	ret->prune_tags = -1;  /* unspecified */
D
Daniel Barkalow 已提交
178 179
	ALLOC_GROW(remotes, remotes_nr + 1, remotes_alloc);
	remotes[remotes_nr++] = ret;
180 181 182 183 184
	ret->name = xstrndup(name, len);

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

188 189
static void add_merge(struct branch *branch, const char *name)
{
D
Daniel Barkalow 已提交
190 191 192
	ALLOC_GROW(branch->merge_name, branch->merge_nr + 1,
		   branch->merge_alloc);
	branch->merge_name[branch->merge_nr++] = name;
193 194 195 196
}

static struct branch *make_branch(const char *name, int len)
{
D
Daniel Barkalow 已提交
197 198
	struct branch *ret;
	int i;
199

D
Daniel Barkalow 已提交
200 201 202 203 204
	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];
205 206
	}

D
Daniel Barkalow 已提交
207 208 209
	ALLOC_GROW(branches, branches_nr + 1, branches_alloc);
	ret = xcalloc(1, sizeof(struct branch));
	branches[branches_nr++] = ret;
210
	if (len)
D
Daniel Barkalow 已提交
211
		ret->name = xstrndup(name, len);
212
	else
D
Daniel Barkalow 已提交
213
		ret->name = xstrdup(name);
214
	ret->refname = xstrfmt("refs/heads/%s", ret->name);
215

D
Daniel Barkalow 已提交
216
	return ret;
217 218
}

219
static struct rewrite *make_rewrite(struct rewrites *r, const char *base, int len)
220 221 222 223
{
	struct rewrite *ret;
	int i;

224
	for (i = 0; i < r->rewrite_nr; i++) {
225
		if (len
226 227 228 229
		    ? (len == r->rewrite[i]->baselen &&
		       !strncmp(base, r->rewrite[i]->base, len))
		    : !strcmp(base, r->rewrite[i]->base))
			return r->rewrite[i];
230 231
	}

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

254 255 256 257 258 259 260
static const char *skip_spaces(const char *s)
{
	while (isspace(*s))
		s++;
	return s;
}

261 262
static void read_remotes_file(struct remote *remote)
{
263
	struct strbuf buf = STRBUF_INIT;
264
	FILE *f = fopen_or_warn(git_path("remotes/%s", remote->name), "r");
265 266 267

	if (!f)
		return;
268
	remote->configured_in_repo = 1;
269
	remote->origin = REMOTE_REMOTES;
270
	while (strbuf_getline(&buf, f) != EOF) {
271
		const char *v;
272

273
		strbuf_rtrim(&buf);
274

275 276 277 278 279 280
		if (skip_prefix(buf.buf, "URL:", &v))
			add_url_alias(remote, xstrdup(skip_spaces(v)));
		else if (skip_prefix(buf.buf, "Push:", &v))
			add_push_refspec(remote, xstrdup(skip_spaces(v)));
		else if (skip_prefix(buf.buf, "Pull:", &v))
			add_fetch_refspec(remote, xstrdup(skip_spaces(v)));
281
	}
282
	strbuf_release(&buf);
283 284 285 286 287
	fclose(f);
}

static void read_branches_file(struct remote *remote)
{
288
	char *frag;
289
	struct strbuf buf = STRBUF_INIT;
290
	FILE *f = fopen_or_warn(git_path("branches/%s", remote->name), "r");
291 292 293

	if (!f)
		return;
294

295
	strbuf_getline_lf(&buf, f);
296
	fclose(f);
297 298 299
	strbuf_trim(&buf);
	if (!buf.len) {
		strbuf_release(&buf);
300
		return;
301 302
	}

303
	remote->configured_in_repo = 1;
304
	remote->origin = REMOTE_BRANCHES;
305 306

	/*
307
	 * The branches file would have URL and optionally
308
	 * #branch specified.  The "master" (or specified) branch is
309 310
	 * fetched and stored in the local branch matching the
	 * remote name.
311
	 */
312 313
	frag = strchr(buf.buf, '#');
	if (frag)
314
		*(frag++) = '\0';
315 316 317 318 319 320
	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));
321

322 323 324 325
	/*
	 * Cogito compatible push: push current HEAD to remote #branch
	 * (master if missing)
	 */
326
	add_push_refspec(remote, xstrfmt("HEAD:refs/heads/%s", frag));
327
	remote->fetch_tags = 1; /* always auto-follow */
328 329
}

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

T
Thomas Gummerer 已提交
369
	if (parse_config_key(key, "remote", &name, &namelen, &subkey) < 0)
370
		return 0;
371 372

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

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

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

470 471
static void read_config(void)
{
472
	static int loaded;
473
	int flag;
474 475

	if (loaded)
476
		return;
477 478
	loaded = 1;

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

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

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

503 504 505 506 507 508 509 510 511 512 513 514
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";
}

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

530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559
const char *remote_ref_for_branch(struct branch *branch, int for_push,
				  int *explicit)
{
	if (branch) {
		if (!for_push) {
			if (branch->merge_nr) {
				if (explicit)
					*explicit = 1;
				return branch->merge_name[0];
			}
		} else {
			const char *dst, *remote_name =
				pushremote_for_branch(branch, NULL);
			struct remote *remote = remote_get(remote_name);

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

560 561
static struct remote *remote_get_1(const char *name,
				   const char *(*get_default)(struct branch *, int *))
562 563
{
	struct remote *ret;
564
	int name_given = 0;
565

566 567
	read_config();

568 569
	if (name)
		name_given = 1;
570 571
	else
		name = get_default(current_branch, &name_given);
572

573
	ret = make_remote(name, 0);
574
	if (valid_remote_nick(name) && have_git_dir()) {
575
		if (!valid_remote(ret))
576
			read_remotes_file(ret);
577
		if (!valid_remote(ret))
578 579
			read_branches_file(ret);
	}
580
	if (name_given && !valid_remote(ret))
581
		add_url_alias(ret, name);
582
	if (!valid_remote(ret))
583
		return NULL;
584 585
	ret->fetch = parse_fetch_refspec(ret->fetch_refspec_nr, ret->fetch_refspec);
	ret->push = parse_push_refspec(ret->push_refspec_nr, ret->push_refspec);
586 587
	return ret;
}
588

589 590
struct remote *remote_get(const char *name)
{
591
	return remote_get_1(name, remote_for_branch);
592 593 594 595
}

struct remote *pushremote_get(const char *name)
{
596
	return remote_get_1(name, pushremote_for_branch);
597 598
}

599
int remote_is_configured(struct remote *remote, int in_repo)
600
{
601 602 603 604 605
	if (!remote)
		return 0;
	if (in_repo)
		return remote->configured_in_repo;
	return !!remote->origin;
606 607
}

608 609 610 611
int for_each_remote(each_remote_fn fn, void *priv)
{
	int i, result = 0;
	read_config();
D
Daniel Barkalow 已提交
612
	for (i = 0; i < remotes_nr && !result; i++) {
613 614 615 616
		struct remote *r = remotes[i];
		if (!r)
			continue;
		if (!r->fetch)
617 618
			r->fetch = parse_fetch_refspec(r->fetch_refspec_nr,
						       r->fetch_refspec);
619
		if (!r->push)
620 621
			r->push = parse_push_refspec(r->push_refspec_nr,
						     r->push_refspec);
622 623 624 625 626
		result = fn(r, priv);
	}
	return result;
}

627 628
static void handle_duplicate(struct ref *ref1, struct ref *ref2)
{
629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650
	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"));
		}
	}
651 652 653 654
	free(ref2->peer_ref);
	free(ref2);
}

655
struct ref *ref_remove_duplicates(struct ref *ref_map)
656
{
657
	struct string_list refs = STRING_LIST_INIT_NODUP;
658 659
	struct ref *retval = NULL;
	struct ref **p = &retval;
660

661 662 663 664 665
	while (ref_map) {
		struct ref *ref = ref_map;

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

667 668 669
		if (!ref->peer_ref) {
			*p = ref;
			p = &ref->next;
670
		} else {
671 672 673 674 675
			struct string_list_item *item =
				string_list_insert(&refs, ref->peer_ref->name);

			if (item->util) {
				/* Entry already existed */
676
				handle_duplicate((struct ref *)item->util, ref);
677 678 679 680 681
			} else {
				*p = ref;
				p = &ref->next;
				item->util = ref;
			}
682 683
		}
	}
684

685
	string_list_clear(&refs, 0);
686
	return retval;
687 688
}

689
int remote_has_url(struct remote *remote, const char *url)
690 691
{
	int i;
692 693
	for (i = 0; i < remote->url_nr; i++) {
		if (!strcmp(remote->url[i], url))
694 695 696 697 698
			return 1;
	}
	return 0;
}

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

727
static void query_refspecs_multiple(struct refspec_item *refs, int ref_count, struct refspec_item *query, struct string_list *results)
728 729 730 731 732 733 734 735
{
	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++) {
736
		struct refspec_item *refspec = &refs[i];
737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752
		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);
		}
	}
}

753
int query_refspecs(struct refspec_item *refs, int ref_count, struct refspec_item *query)
754 755
{
	int i;
756
	int find_src = !query->src;
757 758
	const char *needle = find_src ? query->dst : query->src;
	char **result = find_src ? &query->src : &query->dst;
759

760 761
	if (find_src && !query->dst)
		return error("query_refspecs: need either src or dst");
762

763
	for (i = 0; i < ref_count; i++) {
764
		struct refspec_item *refspec = &refs[i];
765 766
		const char *key = find_src ? refspec->dst : refspec->src;
		const char *value = find_src ? refspec->src : refspec->dst;
767

768
		if (!refspec->dst)
769
			continue;
770
		if (refspec->pattern) {
771
			if (match_name_with_pattern(key, needle, value, result)) {
772
				query->force = refspec->force;
773 774
				return 0;
			}
775 776
		} else if (!strcmp(needle, key)) {
			*result = xstrdup(value);
777
			query->force = refspec->force;
778
			return 0;
779 780 781 782 783
		}
	}
	return -1;
}

784
char *apply_refspecs(struct refspec_item *refspecs, int nr_refspec,
785 786
		     const char *name)
{
787
	struct refspec_item query;
788

789
	memset(&query, 0, sizeof(struct refspec_item));
790 791 792 793 794 795 796 797
	query.src = (char *)name;

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

	return query.dst;
}

798
int remote_find_tracking(struct remote *remote, struct refspec_item *refspec)
799 800 801 802
{
	return query_refspecs(remote->fetch, remote->fetch_refspec_nr, refspec);
}

R
René Scharfe 已提交
803 804 805 806
static struct ref *alloc_ref_with_prefix(const char *prefix, size_t prefixlen,
		const char *name)
{
	size_t len = strlen(name);
807
	struct ref *ref = xcalloc(1, st_add4(sizeof(*ref), prefixlen, len, 1));
R
René Scharfe 已提交
808 809 810 811 812
	memcpy(ref->name, prefix, prefixlen);
	memcpy(ref->name + prefixlen, name, len);
	return ref;
}

813
struct ref *alloc_ref(const char *name)
814
{
815
	return alloc_ref_with_prefix("", 0, name);
816 817
}

J
Jeff King 已提交
818
struct ref *copy_ref(const struct ref *ref)
819
{
820 821 822 823
	struct ref *cpy;
	size_t len;
	if (!ref)
		return NULL;
824 825 826
	len = st_add3(sizeof(struct ref), strlen(ref->name), 1);
	cpy = xmalloc(len);
	memcpy(cpy, ref, len);
827
	cpy->next = NULL;
828 829
	cpy->symref = xstrdup_or_null(ref->symref);
	cpy->remote_status = xstrdup_or_null(ref->remote_status);
830 831
	cpy->peer_ref = copy_ref(ref->peer_ref);
	return cpy;
832 833
}

834 835 836 837 838 839 840 841 842 843 844 845
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;
}

846
static void free_ref(struct ref *ref)
847 848 849
{
	if (!ref)
		return;
850
	free_ref(ref->peer_ref);
851 852 853 854 855
	free(ref->remote_status);
	free(ref->symref);
	free(ref);
}

856 857 858 859 860
void free_refs(struct ref *ref)
{
	struct ref *next;
	while (ref) {
		next = ref->next;
861
		free_ref(ref);
862 863 864 865
		ref = next;
	}
}

866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886
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);
}

887 888 889
int count_refspec_match(const char *pattern,
			struct ref *refs,
			struct ref **matched_ref)
890 891 892 893 894 895 896 897 898 899 900
{
	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);

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

943
static void tail_link_ref(struct ref *ref, struct ref ***tail)
944 945
{
	**tail = ref;
946 947
	while (ref->next)
		ref = ref->next;
948 949 950
	*tail = &ref->next;
}

951 952 953
static struct ref *alloc_delete_ref(void)
{
	struct ref *ref = alloc_ref("(delete)");
954
	oidclr(&ref->new_oid);
955 956 957
	return ref;
}

958 959
static int try_explicit_object_name(const char *name,
				    struct ref **match)
960
{
961
	struct object_id oid;
962

963 964 965 966 967 968
	if (!*name) {
		if (match)
			*match = alloc_delete_ref();
		return 0;
	}

969
	if (get_oid(name, &oid))
970 971 972 973
		return -1;

	if (match) {
		*match = alloc_ref(name);
974
		oidcpy(&(*match)->new_oid, &oid);
975 976
	}
	return 0;
977 978
}

979
static struct ref *make_linked_ref(const char *name, struct ref ***tail)
980
{
981
	struct ref *ret = alloc_ref(name);
982 983
	tail_link_ref(ret, tail);
	return ret;
984
}
985

986 987 988 989
static char *guess_ref(const char *name, struct ref *peer)
{
	struct strbuf buf = STRBUF_INIT;

990
	const char *r = resolve_ref_unsafe(peer->name, RESOLVE_REF_READING,
991
					   NULL, NULL);
992 993 994
	if (!r)
		return NULL;

995
	if (starts_with(r, "refs/heads/"))
996
		strbuf_addstr(&buf, "refs/heads/");
997
	else if (starts_with(r, "refs/tags/"))
998 999 1000 1001 1002 1003 1004 1005
		strbuf_addstr(&buf, "refs/tags/");
	else
		return NULL;

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

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

1031 1032
static int match_explicit(struct ref *src, struct ref *dst,
			  struct ref ***dst_tail,
1033
			  struct refspec_item *rs)
1034
{
1035
	struct ref *matched_src, *matched_dst;
1036
	int allocated_src;
1037

1038
	const char *dst_value = rs->dst;
1039
	char *dst_guess;
1040

1041
	if (rs->pattern || rs->matching)
1042
		return 0;
1043

1044
	matched_src = matched_dst = NULL;
1045 1046
	if (match_explicit_lhs(src, rs, &matched_src, &allocated_src) < 0)
		return -1;
1047

1048
	if (!dst_value) {
1049 1050
		int flag;

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

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

static int match_explicit_refs(struct ref *src, struct ref *dst,
1102
			       struct ref ***dst_tail, struct refspec_item *rs,
1103 1104 1105 1106
			       int rs_nr)
{
	int i, errs;
	for (i = errs = 0; i < rs_nr; i++)
1107 1108
		errs += match_explicit(src, dst, dst_tail, &rs[i]);
	return errs;
1109 1110
}

1111 1112
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)
1113
{
1114
	const struct refspec_item *pat;
1115
	char *name;
1116
	int i;
1117
	int matching_refs = -1;
1118
	for (i = 0; i < rs_nr; i++) {
1119 1120 1121 1122 1123 1124
		if (rs[i].matching &&
		    (matching_refs == -1 || rs[i].force)) {
			matching_refs = i;
			continue;
		}

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

	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.
		 */
1148
		if (!send_mirror && !starts_with(ref->name, "refs/heads/"))
1149 1150 1151 1152 1153 1154
			return NULL;
		name = xstrdup(ref->name);
	}
	if (ret_pat)
		*ret_pat = pat;
	return name;
1155 1156
}

1157 1158 1159 1160 1161 1162 1163 1164
static struct ref **tail_ref(struct ref **head)
{
	struct ref **tail = head;
	while (*tail)
		tail = &((*tail)->next);
	return tail;
}

J
Junio C Hamano 已提交
1165 1166 1167 1168 1169
struct tips {
	struct commit **tip;
	int nr, alloc;
};

1170
static void add_to_tips(struct tips *tips, const struct object_id *oid)
J
Junio C Hamano 已提交
1171 1172 1173
{
	struct commit *commit;

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

1208
	string_list_sort(&dst_tag);
J
Junio C Hamano 已提交
1209 1210 1211

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

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

1261 1262 1263 1264 1265 1266 1267 1268
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;
}

1269 1270 1271 1272 1273
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;

1274
	string_list_sort(ref_index);
1275 1276
}

1277 1278 1279 1280 1281 1282 1283 1284
/*
 * 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)
{
1285
	struct refspec refspec = REFSPEC_INIT_PUSH;
1286 1287 1288
	int ret = 0;
	int i;

1289 1290 1291 1292
	refspec_appendn(&refspec, refspec_names, nr_refspec);

	for (i = 0; i < refspec.nr; i++) {
		struct refspec_item *rs = &refspec.items[i];
1293 1294 1295 1296 1297 1298 1299

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

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

1300
	refspec_clear(&refspec);
1301 1302 1303
	return ret;
}

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

1324 1325 1326 1327 1328
	if (!nr_refspec) {
		nr_refspec = 1;
		refspec = default_refspec;
	}
	rs = parse_push_refspec(nr_refspec, (const char **) refspec);
1329
	errs = match_explicit_refs(src, *dst, &dst_tail, rs, nr_refspec);
1330 1331

	/* pick the remainder */
1332
	for (ref = src; ref; ref = ref->next) {
1333
		struct string_list_item *dst_item;
1334
		struct ref *dst_peer;
1335
		const struct refspec_item *pat = NULL;
1336
		char *dst_name;
1337

F
Felipe Contreras 已提交
1338
		dst_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_SRC, &pat);
1339
		if (!dst_name)
1340 1341
			continue;

1342 1343 1344 1345 1346
		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;
1347 1348 1349 1350 1351 1352 1353 1354 1355
		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 已提交
1356
				 * --all or --mirror.
1357 1358
				 */
				goto free_name;
A
Andy Whitcroft 已提交
1359

1360
			/* Create a new one and link it */
1361
			dst_peer = make_linked_ref(dst_name, &dst_tail);
1362
			oidcpy(&dst_peer->new_oid, &ref->new_oid);
1363 1364
			string_list_insert(&dst_ref_index,
				dst_peer->name)->util = dst_peer;
1365
		}
1366
		dst_peer->peer_ref = copy_ref(ref);
1367
		dst_peer->force = pat->force;
1368 1369
	free_name:
		free(dst_name);
1370
	}
J
Junio C Hamano 已提交
1371

1372 1373
	string_list_clear(&dst_ref_index, 0);

J
Junio C Hamano 已提交
1374 1375 1376
	if (flags & MATCH_REFS_FOLLOW_TAGS)
		add_missing_tags(src, dst, &dst_tail);

F
Felipe Contreras 已提交
1377
	if (send_prune) {
1378
		struct string_list src_ref_index = STRING_LIST_INIT_NODUP;
F
Felipe Contreras 已提交
1379 1380 1381 1382 1383 1384 1385 1386 1387 1388
		/* check for missing refs on the remote */
		for (ref = *dst; ref; ref = ref->next) {
			char *src_name;

			if (ref->peer_ref)
				/* We're already sending something to this ref. */
				continue;

			src_name = get_ref_match(rs, nr_refspec, ref, send_mirror, FROM_DST, NULL);
			if (src_name) {
1389 1390 1391 1392
				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 已提交
1393 1394 1395 1396
					ref->peer_ref = alloc_delete_ref();
				free(src_name);
			}
		}
1397
		string_list_clear(&src_ref_index, 0);
F
Felipe Contreras 已提交
1398
	}
1399 1400
	if (errs)
		return -1;
1401 1402
	return 0;
}
1403

1404
void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
1405
			     int force_update)
1406 1407 1408 1409
{
	struct ref *ref;

	for (ref = remote_refs; ref; ref = ref->next) {
1410
		int force_ref_update = ref->force || force_update;
1411
		int reject_reason = 0;
1412

1413
		if (ref->peer_ref)
1414
			oidcpy(&ref->new_oid, &ref->peer_ref->new_oid);
1415 1416 1417
		else if (!send_mirror)
			continue;

1418
		ref->deletion = is_null_oid(&ref->new_oid);
1419
		if (!ref->deletion &&
1420
			!oidcmp(&ref->old_oid, &ref->new_oid)) {
1421 1422 1423 1424
			ref->status = REF_STATUS_UPTODATE;
			continue;
		}

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

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

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

		/*
		 * "--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;
1483 1484 1485
	}
}

1486 1487
static void set_merge(struct branch *ret)
{
1488
	struct remote *remote;
1489
	char *ref;
1490
	struct object_id oid;
1491 1492
	int i;

1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505
	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;
	}

1506 1507
	remote = remote_get(ret->remote_name);

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

1523 1524 1525 1526 1527 1528 1529 1530 1531
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);
1532
	set_merge(ret);
1533 1534 1535 1536 1537 1538 1539 1540
	return ret;
}

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

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

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

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

	if (!branch->merge[0]->dst)
1582 1583 1584 1585
		return error_buf(err,
				 _("upstream branch '%s' not stored as a remote-tracking branch"),
				 branch->merge[0]->src);

1586 1587 1588
	return branch->merge[0]->dst;
}

J
Jeff King 已提交
1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 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 1662 1663 1664 1665
static const char *tracking_for_push_dest(struct remote *remote,
					  const char *refname,
					  struct strbuf *err)
{
	char *ret;

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

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

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

	if (remote->push_refspec_nr) {
		char *dst;
		const char *ret;

		dst = apply_refspecs(remote->push, remote->push_refspec_nr,
				     branch->refname);
		if (!dst)
			return error_buf(err,
					 _("push refspecs for '%s' do not include '%s'"),
					 remote->name, branch->name);

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

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

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

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

	case PUSH_DEFAULT_UPSTREAM:
		return branch_get_upstream(branch, err);

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

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

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

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

J
Jeff King 已提交
1669 1670 1671 1672 1673
	if (!branch->push_tracking_ref)
		branch->push_tracking_ref = branch_get_push_1(branch, err);
	return branch->push_tracking_ref;
}

1674 1675 1676 1677
static int ignore_symref_update(const char *refname)
{
	int flag;

1678
	if (!resolve_ref_unsafe(refname, 0, NULL, &flag))
1679 1680 1681 1682
		return 0; /* non-existing refs are OK */
	return (flag & REF_ISSYMREF);
}

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

	for (ref = remote_refs; ref; ref = ref->next) {
1698 1699
		char *expn_name = NULL;

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

1707
			cpy->peer_ref = alloc_ref(expn_name);
1708 1709 1710 1711 1712
			if (refspec->force)
				cpy->peer_ref->force = 1;
			*tail = cpy;
			tail = &cpy->next;
		}
1713
		free(expn_name);
1714 1715 1716 1717 1718
	}

	return ret;
}

1719
static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
1720
{
1721
	const struct ref *ref;
1722
	for (ref = refs; ref; ref = ref->next) {
1723
		if (refname_match(name, ref->name))
1724 1725 1726 1727 1728
			return ref;
	}
	return NULL;
}

1729
struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
1730
{
1731
	const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
1732 1733

	if (!ref)
1734
		return NULL;
1735 1736 1737 1738 1739 1740

	return copy_ref(ref);
}

static struct ref *get_local_ref(const char *name)
{
1741
	if (!name || name[0] == '\0')
1742 1743
		return NULL;

1744
	if (starts_with(name, "refs/"))
1745
		return alloc_ref(name);
1746

1747 1748 1749
	if (starts_with(name, "heads/") ||
	    starts_with(name, "tags/") ||
	    starts_with(name, "remotes/"))
R
René Scharfe 已提交
1750
		return alloc_ref_with_prefix("refs/", 5, name);
1751

R
René Scharfe 已提交
1752
	return alloc_ref_with_prefix("refs/heads/", 11, name);
1753 1754
}

1755
int get_fetch_map(const struct ref *remote_refs,
1756
		  const struct refspec_item *refspec,
1757 1758
		  struct ref ***tail,
		  int missing_ok)
1759
{
D
Daniel Barkalow 已提交
1760
	struct ref *ref_map, **rmp;
1761 1762 1763 1764

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

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

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

1798 1799
	if (ref_map)
		tail_link_ref(ref_map, tail);
1800 1801 1802

	return 0;
}
1803 1804 1805 1806 1807 1808 1809

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)) {
1810
			oidcpy(&ref->old_oid, &list->old_oid);
1811 1812 1813 1814
			return 0;
		}
	return 1;
}
1815

1816 1817 1818
static void unmark_and_free(struct commit_list *list, unsigned int mark)
{
	while (list) {
1819 1820
		struct commit *commit = pop_commit(&list);
		commit->object.flags &= ~mark;
1821 1822 1823
	}
}

1824
int ref_newer(const struct object_id *new_oid, const struct object_id *old_oid)
1825 1826
{
	struct object *o;
1827
	struct commit *old_commit, *new_commit;
1828 1829 1830
	struct commit_list *list, *used;
	int found = 0;

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

1840
	o = deref_tag(parse_object(new_oid), NULL, 0);
1841 1842
	if (!o || o->type != OBJ_COMMIT)
		return 0;
1843
	new_commit = (struct commit *) o;
1844

1845
	if (parse_commit(new_commit) < 0)
1846 1847 1848
		return 0;

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

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

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

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

1902
	if (read_ref(branch->refname, &oid))
1903
		return -1;
1904
	ours = lookup_commit_reference(&oid);
1905
	if (!ours)
1906
		return -1;
1907

1908 1909
	*num_theirs = *num_ours = 0;

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

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

	init_revisions(&revs, NULL);
1927
	setup_revisions(argv.argc, argv.argv, &revs, NULL);
1928 1929
	if (prepare_revision_walk(&revs))
		die("revision walk setup failed");
1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940

	/* ... 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)++;
	}
1941 1942 1943 1944

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

	argv_array_clear(&argv);
1947
	return 1;
1948 1949 1950 1951 1952
}

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

1961 1962
	sti = stat_tracking_info(branch, &ours, &theirs, &full_base, abf);
	if (sti < 0) {
1963 1964
		if (!full_base)
			return 0;
1965 1966
		upstream_is_gone = 1;
	}
1967

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

2025 2026
static int one_local_ref(const char *refname, const struct object_id *oid,
			 int flag, void *cb_data)
2027 2028 2029 2030 2031
{
	struct ref ***local_tail = cb_data;
	struct ref *ref;

	/* we already know it starts with refs/ to get here */
2032
	if (check_refname_format(refname + 5, 0))
2033 2034
		return 0;

2035
	ref = alloc_ref(refname);
2036
	oidcpy(&ref->new_oid, oid);
2037 2038 2039 2040 2041 2042 2043
	**local_tail = ref;
	*local_tail = &ref->next;
	return 0;
}

struct ref *get_local_heads(void)
{
2044
	struct ref *local_refs = NULL, **local_tail = &local_refs;
2045

2046 2047 2048
	for_each_ref(one_local_ref, &local_tail);
	return local_refs;
}
J
Jay Soffian 已提交
2049

2050 2051 2052
struct ref *guess_remote_head(const struct ref *head,
			      const struct ref *refs,
			      int all)
J
Jay Soffian 已提交
2053 2054
{
	const struct ref *r;
2055 2056
	struct ref *list = NULL;
	struct ref **tail = &list;
J
Jay Soffian 已提交
2057

2058
	if (!head)
J
Jay Soffian 已提交
2059 2060
		return NULL;

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

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

2088
	return list;
J
Jay Soffian 已提交
2089
}
2090 2091 2092 2093

struct stale_heads_info {
	struct string_list *ref_names;
	struct ref **stale_refs_tail;
2094
	struct refspec_item *refs;
2095
	int ref_count;
2096 2097
};

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

2108 2109 2110
	query_refspecs_multiple(info->refs, info->ref_count, &query, &matches);
	if (matches.nr == 0)
		goto clean_exit; /* No matches */
2111 2112 2113 2114

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

2131 2132
clean_exit:
	string_list_clear(&matches, 0);
2133 2134 2135
	return 0;
}

2136
struct ref *get_stale_heads(struct refspec_item *refs, int ref_count, struct ref *fetch_map)
2137 2138
{
	struct ref *ref, *stale_refs = NULL;
2139
	struct string_list ref_names = STRING_LIST_INIT_NODUP;
2140
	struct stale_heads_info info;
2141

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

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

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

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,
2225
			   struct object_id *oid)
2226 2227 2228 2229 2230 2231
{
	char *dst;

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

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

	ref->expect_old_sha1 = 1;
2261
	if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
2262
		oidclr(&ref->old_oid_expect);
2263 2264 2265 2266 2267 2268 2269 2270 2271 2272
}

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