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

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

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

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

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

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

49
static struct rewrites rewrites;
50
static struct rewrites rewrites_push;
51

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

252
		strbuf_rtrim(&buf);
253

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

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

	if (!f)
		return;
273

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

550 551
	read_config();

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

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

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

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

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

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

603 604
static void handle_duplicate(struct ref *ref1, struct ref *ref2)
{
605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623
	if (strcmp(ref1->name, ref2->name)) {
		if (ref1->fetch_head_status != FETCH_HEAD_IGNORE &&
		    ref2->fetch_head_status != FETCH_HEAD_IGNORE) {
			die(_("Cannot fetch both %s and %s to %s"),
			    ref1->name, ref2->name, ref2->peer_ref->name);
		} else if (ref1->fetch_head_status != FETCH_HEAD_IGNORE &&
			   ref2->fetch_head_status == FETCH_HEAD_IGNORE) {
			warning(_("%s usually tracks %s, not %s"),
				ref2->peer_ref->name, ref2->name, ref1->name);
		} else if (ref1->fetch_head_status == FETCH_HEAD_IGNORE &&
			   ref2->fetch_head_status == FETCH_HEAD_IGNORE) {
			die(_("%s tracks both %s and %s"),
			    ref2->peer_ref->name, ref1->name, ref2->name);
		} else {
			/*
			 * This last possibility doesn't occur because
			 * FETCH_HEAD_IGNORE entries always appear at
			 * the end of the list.
			 */
624
			BUG("Internal error");
625 626
		}
	}
627 628 629 630
	free(ref2->peer_ref);
	free(ref2);
}

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

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

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

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

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

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

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

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

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

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

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

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

738
	if (find_src && !query->dst)
739
		BUG("query_refspecs: need either src or dst");
740

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

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

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

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

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

	return query.dst;
}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

1009 1010 1011
static void show_push_unqualified_ref_name_error(const char *dst_value,
						 const char *matched_src_name)
{
1012 1013 1014
	struct object_id oid;
	enum object_type type;

1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029
	/*
	 * TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
	 * <remote> <src>:<dst>" push, and "being pushed ('%s')" is
	 * the <src>.
	 */
	error(_("The destination you provided is not a full refname (i.e.,\n"
		"starting with \"refs/\"). We tried to guess what you meant by:\n"
		"\n"
		"- Looking for a ref that matches '%s' on the remote side.\n"
		"- Checking if the <src> being pushed ('%s')\n"
		"  is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
		"  refs/{heads,tags}/ prefix on the remote side.\n"
		"\n"
		"Neither worked, so we gave up. You must fully qualify the ref."),
	      dst_value, matched_src_name);
1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062

	if (!advice_push_unqualified_ref_name)
		return;

	if (get_oid(matched_src_name, &oid))
		BUG("'%s' is not a valid object, "
		    "match_explicit_lhs() should catch this!",
		    matched_src_name);
	type = oid_object_info(the_repository, &oid, NULL);
	if (type == OBJ_COMMIT) {
		advise(_("The <src> part of the refspec is a commit object.\n"
			 "Did you mean to create a new branch by pushing to\n"
			 "'%s:refs/heads/%s'?"),
		       matched_src_name, dst_value);
	} else if (type == OBJ_TAG) {
		advise(_("The <src> part of the refspec is a tag object.\n"
			 "Did you mean to create a new tag by pushing to\n"
			 "'%s:refs/tags/%s'?"),
		       matched_src_name, dst_value);
	} else if (type == OBJ_TREE) {
		advise(_("The <src> part of the refspec is a tree object.\n"
			 "Did you mean to tag a new tree by pushing to\n"
			 "'%s:refs/tags/%s'?"),
		       matched_src_name, dst_value);
	} else if (type == OBJ_BLOB) {
		advise(_("The <src> part of the refspec is a blob object.\n"
			 "Did you mean to tag a new blob by pushing to\n"
			 "'%s:refs/tags/%s'?"),
		       matched_src_name, dst_value);
	} else {
		BUG("'%s' should be commit/tag/tree/blob, is '%d'",
		    matched_src_name, type);
	}
1063 1064
}

1065 1066
static int match_explicit(struct ref *src, struct ref *dst,
			  struct ref ***dst_tail,
1067
			  struct refspec_item *rs)
1068
{
1069
	struct ref *matched_src, *matched_dst;
1070
	int allocated_src;
1071

1072
	const char *dst_value = rs->dst;
1073
	char *dst_guess;
1074

1075
	if (rs->pattern || rs->matching)
1076
		return 0;
1077

1078
	matched_src = matched_dst = NULL;
1079 1080
	if (match_explicit_lhs(src, rs, &matched_src, &allocated_src) < 0)
		return -1;
1081

1082
	if (!dst_value) {
1083 1084
		int flag;

1085 1086
		dst_value = resolve_ref_unsafe(matched_src->name,
					       RESOLVE_REF_READING,
1087
					       NULL, &flag);
1088 1089
		if (!dst_value ||
		    ((flag & REF_ISSYMREF) &&
1090
		     !starts_with(dst_value, "refs/heads/")))
1091
			die(_("%s cannot be resolved to branch"),
1092
			    matched_src->name);
1093
	}
1094

1095 1096 1097 1098
	switch (count_refspec_match(dst_value, dst, &matched_dst)) {
	case 1:
		break;
	case 0:
1099
		if (starts_with(dst_value, "refs/")) {
1100
			matched_dst = make_linked_ref(dst_value, dst_tail);
1101
		} else if (is_null_oid(&matched_src->new_oid)) {
1102
			error(_("unable to delete '%s': remote ref does not exist"),
1103
			      dst_value);
1104
		} else if ((dst_guess = guess_ref(dst_value, matched_src))) {
1105
			matched_dst = make_linked_ref(dst_guess, dst_tail);
1106
			free(dst_guess);
1107
		} else {
1108 1109
			show_push_unqualified_ref_name_error(dst_value,
							     matched_src->name);
1110
		}
1111 1112
		break;
	default:
1113
		matched_dst = NULL;
1114
		error(_("dst refspec %s matches more than one"),
1115 1116 1117
		      dst_value);
		break;
	}
1118 1119 1120
	if (!matched_dst)
		return -1;
	if (matched_dst->peer_ref)
1121 1122
		return error(_("dst ref %s receives from more than one src"),
			     matched_dst->name);
1123
	else {
1124 1125 1126
		matched_dst->peer_ref = allocated_src ?
					matched_src :
					copy_ref(matched_src);
1127
		matched_dst->force = rs->force;
1128
	}
1129
	return 0;
1130 1131 1132
}

static int match_explicit_refs(struct ref *src, struct ref *dst,
1133
			       struct ref ***dst_tail, struct refspec *rs)
1134 1135
{
	int i, errs;
1136 1137
	for (i = errs = 0; i < rs->nr; i++)
		errs += match_explicit(src, dst, dst_tail, &rs->items[i]);
1138
	return errs;
1139 1140
}

1141 1142 1143
static char *get_ref_match(const struct refspec *rs, const struct ref *ref,
			   int send_mirror, int direction,
			   const struct refspec_item **ret_pat)
1144
{
1145
	const struct refspec_item *pat;
1146
	char *name;
1147
	int i;
1148
	int matching_refs = -1;
1149 1150 1151 1152
	for (i = 0; i < rs->nr; i++) {
		const struct refspec_item *item = &rs->items[i];
		if (item->matching &&
		    (matching_refs == -1 || item->force)) {
1153 1154 1155 1156
			matching_refs = i;
			continue;
		}

1157 1158
		if (item->pattern) {
			const char *dst_side = item->dst ? item->dst : item->src;
F
Felipe Contreras 已提交
1159 1160
			int match;
			if (direction == FROM_SRC)
1161
				match = match_name_with_pattern(item->src, ref->name, dst_side, &name);
F
Felipe Contreras 已提交
1162
			else
1163
				match = match_name_with_pattern(dst_side, ref->name, item->src, &name);
F
Felipe Contreras 已提交
1164
			if (match) {
1165 1166 1167 1168
				matching_refs = i;
				break;
			}
		}
1169
	}
1170
	if (matching_refs == -1)
1171
		return NULL;
1172

1173
	pat = &rs->items[matching_refs];
1174 1175 1176 1177 1178 1179
	if (pat->matching) {
		/*
		 * "matching refs"; traditionally we pushed everything
		 * including refs outside refs/heads/ hierarchy, but
		 * that does not make much sense these days.
		 */
1180
		if (!send_mirror && !starts_with(ref->name, "refs/heads/"))
1181 1182 1183 1184 1185 1186
			return NULL;
		name = xstrdup(ref->name);
	}
	if (ret_pat)
		*ret_pat = pat;
	return name;
1187 1188
}

1189 1190 1191 1192 1193 1194 1195 1196
static struct ref **tail_ref(struct ref **head)
{
	struct ref **tail = head;
	while (*tail)
		tail = &((*tail)->next);
	return tail;
}

J
Junio C Hamano 已提交
1197 1198 1199 1200 1201
struct tips {
	struct commit **tip;
	int nr, alloc;
};

1202
static void add_to_tips(struct tips *tips, const struct object_id *oid)
J
Junio C Hamano 已提交
1203 1204 1205
{
	struct commit *commit;

1206
	if (is_null_oid(oid))
J
Junio C Hamano 已提交
1207
		return;
1208
	commit = lookup_commit_reference_gently(the_repository, oid, 1);
J
Junio C Hamano 已提交
1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230
	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 &&
1231
		    !is_null_oid(&ref->peer_ref->new_oid))
1232
			add_to_tips(&sent_tips, &ref->peer_ref->new_oid);
J
Junio C Hamano 已提交
1233
		else
1234
			add_to_tips(&sent_tips, &ref->old_oid);
1235
		if (starts_with(ref->name, "refs/tags/"))
J
Junio C Hamano 已提交
1236 1237 1238 1239
			string_list_append(&dst_tag, ref->name);
	}
	clear_commit_marks_many(sent_tips.nr, sent_tips.tip, TMP_MARK);

1240
	string_list_sort(&dst_tag);
J
Junio C Hamano 已提交
1241 1242 1243

	/* Collect tags they do not have. */
	for (ref = src; ref; ref = ref->next) {
1244
		if (!starts_with(ref->name, "refs/tags/"))
J
Junio C Hamano 已提交
1245 1246 1247
			continue; /* not a tag */
		if (string_list_has_string(&dst_tag, ref->name))
			continue; /* they already have it */
1248
		if (oid_object_info(the_repository, &ref->new_oid, NULL) != OBJ_TAG)
J
Junio C Hamano 已提交
1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262
			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) {
1263 1264 1265 1266 1267 1268
		const int reachable_flag = 1;
		struct commit_list *found_commits;
		struct commit **src_commits;
		int nr_src_commits = 0, alloc_src_commits = 16;
		ALLOC_ARRAY(src_commits, alloc_src_commits);

J
Junio C Hamano 已提交
1269 1270
		for_each_string_list_item(item, &src_tag) {
			struct ref *ref = item->util;
1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290
			struct commit *commit;

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

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

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

		for_each_string_list_item(item, &src_tag) {
J
Junio C Hamano 已提交
1291
			struct ref *dst_ref;
1292
			struct ref *ref = item->util;
J
Junio C Hamano 已提交
1293 1294
			struct commit *commit;

1295
			if (is_null_oid(&ref->new_oid))
J
Junio C Hamano 已提交
1296
				continue;
1297 1298
			commit = lookup_commit_reference_gently(the_repository,
								&ref->new_oid,
1299
								1);
J
Junio C Hamano 已提交
1300 1301 1302 1303 1304 1305 1306 1307
			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?
			 */
1308
			if (!(commit->object.flags & reachable_flag))
J
Junio C Hamano 已提交
1309 1310 1311 1312
				continue;

			/* Add it in */
			dst_ref = make_linked_ref(ref->name, dst_tail);
1313
			oidcpy(&dst_ref->new_oid, &ref->new_oid);
J
Junio C Hamano 已提交
1314 1315
			dst_ref->peer_ref = copy_ref(ref);
		}
1316 1317 1318 1319

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

J
Junio C Hamano 已提交
1322 1323 1324 1325
	string_list_clear(&src_tag, 0);
	free(sent_tips.tip);
}

1326 1327 1328 1329 1330 1331 1332 1333
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;
}

1334 1335 1336 1337 1338
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;

1339
	string_list_sort(ref_index);
1340 1341
}

1342 1343 1344 1345 1346 1347
/*
 * 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.
 */
1348
int check_push_refs(struct ref *src, struct refspec *rs)
1349 1350 1351 1352
{
	int ret = 0;
	int i;

1353 1354
	for (i = 0; i < rs->nr; i++) {
		struct refspec_item *item = &rs->items[i];
1355

1356
		if (item->pattern || item->matching)
1357 1358
			continue;

1359
		ret |= match_explicit_lhs(src, item, NULL, NULL);
1360 1361 1362 1363 1364
	}

	return ret;
}

1365
/*
1366 1367 1368 1369 1370 1371
 * 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).
1372
 */
1373
int match_push_refs(struct ref *src, struct ref **dst,
1374
		    struct refspec *rs, int flags)
1375
{
A
Andy Whitcroft 已提交
1376 1377
	int send_all = flags & MATCH_REFS_ALL;
	int send_mirror = flags & MATCH_REFS_MIRROR;
F
Felipe Contreras 已提交
1378
	int send_prune = flags & MATCH_REFS_PRUNE;
1379
	int errs;
1380
	struct ref *ref, **dst_tail = tail_ref(dst);
1381
	struct string_list dst_ref_index = STRING_LIST_INIT_NODUP;
1382

1383 1384 1385 1386 1387
	/* If no refspec is provided, use the default ":" */
	if (!rs->nr)
		refspec_append(rs, ":");

	errs = match_explicit_refs(src, *dst, &dst_tail, rs);
1388 1389

	/* pick the remainder */
1390
	for (ref = src; ref; ref = ref->next) {
1391
		struct string_list_item *dst_item;
1392
		struct ref *dst_peer;
1393
		const struct refspec_item *pat = NULL;
1394
		char *dst_name;
1395

1396
		dst_name = get_ref_match(rs, ref, send_mirror, FROM_SRC, &pat);
1397
		if (!dst_name)
1398 1399
			continue;

1400 1401 1402 1403 1404
		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;
1405 1406 1407 1408 1409 1410 1411 1412 1413
		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 已提交
1414
				 * --all or --mirror.
1415 1416
				 */
				goto free_name;
A
Andy Whitcroft 已提交
1417

1418
			/* Create a new one and link it */
1419
			dst_peer = make_linked_ref(dst_name, &dst_tail);
1420
			oidcpy(&dst_peer->new_oid, &ref->new_oid);
1421 1422
			string_list_insert(&dst_ref_index,
				dst_peer->name)->util = dst_peer;
1423
		}
1424
		dst_peer->peer_ref = copy_ref(ref);
1425
		dst_peer->force = pat->force;
1426 1427
	free_name:
		free(dst_name);
1428
	}
J
Junio C Hamano 已提交
1429

1430 1431
	string_list_clear(&dst_ref_index, 0);

J
Junio C Hamano 已提交
1432 1433 1434
	if (flags & MATCH_REFS_FOLLOW_TAGS)
		add_missing_tags(src, dst, &dst_tail);

F
Felipe Contreras 已提交
1435
	if (send_prune) {
1436
		struct string_list src_ref_index = STRING_LIST_INIT_NODUP;
F
Felipe Contreras 已提交
1437 1438 1439 1440 1441 1442 1443 1444
		/* 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;

1445
			src_name = get_ref_match(rs, ref, send_mirror, FROM_DST, NULL);
F
Felipe Contreras 已提交
1446
			if (src_name) {
1447 1448 1449 1450
				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 已提交
1451 1452 1453 1454
					ref->peer_ref = alloc_delete_ref();
				free(src_name);
			}
		}
1455
		string_list_clear(&src_ref_index, 0);
F
Felipe Contreras 已提交
1456
	}
1457

1458 1459
	if (errs)
		return -1;
1460 1461
	return 0;
}
1462

1463
void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
1464
			     int force_update)
1465 1466 1467 1468
{
	struct ref *ref;

	for (ref = remote_refs; ref; ref = ref->next) {
1469
		int force_ref_update = ref->force || force_update;
1470
		int reject_reason = 0;
1471

1472
		if (ref->peer_ref)
1473
			oidcpy(&ref->new_oid, &ref->peer_ref->new_oid);
1474 1475 1476
		else if (!send_mirror)
			continue;

1477
		ref->deletion = is_null_oid(&ref->new_oid);
1478
		if (!ref->deletion &&
J
Jeff King 已提交
1479
			oideq(&ref->old_oid, &ref->new_oid)) {
1480 1481 1482 1483
			ref->status = REF_STATUS_UPTODATE;
			continue;
		}

C
Chris Rorvick 已提交
1484
		/*
1485 1486
		 * If the remote ref has moved and is now different
		 * from what we expect, reject any push.
1487 1488 1489 1490 1491 1492 1493
		 *
		 * 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) {
1494
			if (!oideq(&ref->old_oid, &ref->old_oid_expect))
1495
				reject_reason = REF_STATUS_REJECT_STALE;
1496 1497 1498
			else
				/* If the ref isn't stale then force the update. */
				force_ref_update = 1;
1499 1500 1501
		}

		/*
1502 1503
		 * If the update isn't already rejected then check
		 * the usual "must fast-forward" rules.
1504
		 *
1505 1506 1507
		 * Decide whether an individual refspec A:B can be
		 * pushed.  The push will succeed if any of the
		 * following are true:
1508
		 *
C
Chris Rorvick 已提交
1509
		 * (1) the remote reference B does not exist
1510
		 *
C
Chris Rorvick 已提交
1511 1512
		 * (2) the remote reference B is being removed (i.e.,
		 *     pushing :B where no source is specified)
1513
		 *
1514 1515 1516
		 * (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.
1517
		 *
C
Chris Rorvick 已提交
1518 1519
		 * (4) it is forced using the +A:B notation, or by
		 *     passing the --force argument
1520 1521
		 */

1522
		if (!reject_reason && !ref->deletion && !is_null_oid(&ref->old_oid)) {
1523
			if (starts_with(ref->name, "refs/tags/"))
1524
				reject_reason = REF_STATUS_REJECT_ALREADY_EXISTS;
1525
			else if (!has_object_file(&ref->old_oid))
1526
				reject_reason = REF_STATUS_REJECT_FETCH_FIRST;
1527 1528
			else if (!lookup_commit_reference_gently(the_repository, &ref->old_oid, 1) ||
				 !lookup_commit_reference_gently(the_repository, &ref->new_oid, 1))
1529
				reject_reason = REF_STATUS_REJECT_NEEDS_FORCE;
1530
			else if (!ref_newer(&ref->new_oid, &ref->old_oid))
1531
				reject_reason = REF_STATUS_REJECT_NONFASTFORWARD;
1532
		}
1533 1534 1535 1536 1537 1538 1539 1540 1541

		/*
		 * "--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;
1542 1543 1544
	}
}

1545 1546
static void set_merge(struct branch *ret)
{
1547
	struct remote *remote;
1548
	char *ref;
1549
	struct object_id oid;
1550 1551
	int i;

1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564
	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;
	}

1565 1566
	remote = remote_get(ret->remote_name);

1567 1568 1569 1570
	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]);
1571
		if (!remote_find_tracking(remote, ret->merge[i]) ||
1572 1573 1574
		    strcmp(ret->remote_name, "."))
			continue;
		if (dwim_ref(ret->merge_name[i], strlen(ret->merge_name[i]),
1575
			     &oid, &ref) == 1)
1576 1577 1578 1579 1580 1581
			ret->merge[i]->dst = ref;
		else
			ret->merge[i]->dst = xstrdup(ret->merge_name[i]);
	}
}

1582 1583 1584 1585 1586 1587 1588 1589 1590
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);
1591
	set_merge(ret);
1592 1593 1594 1595 1596 1597 1598 1599
	return ret;
}

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

1600 1601 1602
int branch_merge_matches(struct branch *branch,
		                 int i,
		                 const char *refname)
1603
{
1604
	if (!branch || i < 0 || i >= branch->merge_nr)
1605
		return 0;
1606
	return refname_match(branch->merge[i]->src, refname);
1607
}
1608

1609
__attribute__((format (printf,2,3)))
1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624
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"));
1625 1626 1627 1628 1629 1630 1631

	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?
		 */
1632 1633 1634
		if (!ref_exists(branch->refname))
			return error_buf(err, _("no such branch: '%s'"),
					 branch->name);
1635 1636 1637 1638 1639 1640
		return error_buf(err,
				 _("no upstream configured for branch '%s'"),
				 branch->name);
	}

	if (!branch->merge[0]->dst)
1641 1642 1643 1644
		return error_buf(err,
				 _("upstream branch '%s' not stored as a remote-tracking branch"),
				 branch->merge[0]->src);

1645 1646 1647
	return branch->merge[0]->dst;
}

J
Jeff King 已提交
1648 1649 1650 1651 1652 1653
static const char *tracking_for_push_dest(struct remote *remote,
					  const char *refname,
					  struct strbuf *err)
{
	char *ret;

1654
	ret = apply_refspecs(&remote->fetch, refname);
J
Jeff King 已提交
1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671
	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);

1672
	if (remote->push.nr) {
J
Jeff King 已提交
1673 1674 1675
		char *dst;
		const char *ret;

1676
		dst = apply_refspecs(&remote->push, branch->refname);
J
Jeff King 已提交
1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718
		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;
		}
	}

1719
	BUG("unhandled push situation");
J
Jeff King 已提交
1720 1721 1722 1723
}

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

J
Jeff King 已提交
1727 1728 1729 1730 1731
	if (!branch->push_tracking_ref)
		branch->push_tracking_ref = branch_get_push_1(branch, err);
	return branch->push_tracking_ref;
}

1732 1733 1734 1735
static int ignore_symref_update(const char *refname)
{
	int flag;

1736
	if (!resolve_ref_unsafe(refname, 0, NULL, &flag))
1737 1738 1739 1740
		return 0; /* non-existing refs are OK */
	return (flag & REF_ISSYMREF);
}

1741 1742 1743 1744 1745 1746 1747
/*
 * 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.
 */
1748
static struct ref *get_expanded_map(const struct ref *remote_refs,
1749
				    const struct refspec_item *refspec)
1750
{
1751
	const struct ref *ref;
1752 1753 1754 1755
	struct ref *ret = NULL;
	struct ref **tail = &ret;

	for (ref = remote_refs; ref; ref = ref->next) {
1756 1757
		char *expn_name = NULL;

1758 1759
		if (strchr(ref->name, '^'))
			continue; /* a dereference item */
1760
		if (match_name_with_pattern(refspec->src, ref->name,
1761 1762
					    refspec->dst, &expn_name) &&
		    !ignore_symref_update(expn_name)) {
1763 1764
			struct ref *cpy = copy_ref(ref);

1765
			cpy->peer_ref = alloc_ref(expn_name);
1766 1767 1768 1769 1770
			if (refspec->force)
				cpy->peer_ref->force = 1;
			*tail = cpy;
			tail = &cpy->next;
		}
1771
		free(expn_name);
1772 1773 1774 1775 1776
	}

	return ret;
}

1777
static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const char *name)
1778
{
1779
	const struct ref *ref;
1780 1781 1782
	const struct ref *best_match = NULL;
	int best_score = 0;

1783
	for (ref = refs; ref; ref = ref->next) {
1784 1785 1786 1787 1788 1789
		int score = refname_match(name, ref->name);

		if (best_score < score) {
			best_match = ref;
			best_score = score;
		}
1790
	}
1791
	return best_match;
1792 1793
}

1794
struct ref *get_remote_ref(const struct ref *remote_refs, const char *name)
1795
{
1796
	const struct ref *ref = find_ref_by_name_abbrev(remote_refs, name);
1797 1798

	if (!ref)
1799
		return NULL;
1800 1801 1802 1803 1804 1805

	return copy_ref(ref);
}

static struct ref *get_local_ref(const char *name)
{
1806
	if (!name || name[0] == '\0')
1807 1808
		return NULL;

1809
	if (starts_with(name, "refs/"))
1810
		return alloc_ref(name);
1811

1812 1813 1814
	if (starts_with(name, "heads/") ||
	    starts_with(name, "tags/") ||
	    starts_with(name, "remotes/"))
R
René Scharfe 已提交
1815
		return alloc_ref_with_prefix("refs/", 5, name);
1816

R
René Scharfe 已提交
1817
	return alloc_ref_with_prefix("refs/heads/", 11, name);
1818 1819
}

1820
int get_fetch_map(const struct ref *remote_refs,
1821
		  const struct refspec_item *refspec,
1822 1823
		  struct ref ***tail,
		  int missing_ok)
1824
{
D
Daniel Barkalow 已提交
1825
	struct ref *ref_map, **rmp;
1826 1827 1828 1829

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

1832 1833
		if (refspec->exact_sha1) {
			ref_map = alloc_ref(name);
1834
			get_oid_hex(name, &ref_map->old_oid);
1835
			ref_map->exact_oid = 1;
1836 1837 1838
		} else {
			ref_map = get_remote_ref(remote_refs, name);
		}
1839
		if (!missing_ok && !ref_map)
1840
			die(_("couldn't find remote ref %s"), name);
1841 1842 1843 1844 1845
		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;
		}
1846 1847
	}

D
Daniel Barkalow 已提交
1848 1849
	for (rmp = &ref_map; *rmp; ) {
		if ((*rmp)->peer_ref) {
1850
			if (!starts_with((*rmp)->peer_ref->name, "refs/") ||
1851
			    check_refname_format((*rmp)->peer_ref->name, 0)) {
D
Daniel Barkalow 已提交
1852
				struct ref *ignore = *rmp;
1853
				error(_("* Ignoring funny ref '%s' locally"),
D
Daniel Barkalow 已提交
1854 1855 1856 1857 1858 1859 1860 1861
				      (*rmp)->peer_ref->name);
				*rmp = (*rmp)->next;
				free(ignore->peer_ref);
				free(ignore);
				continue;
			}
		}
		rmp = &((*rmp)->next);
1862 1863
	}

1864 1865
	if (ref_map)
		tail_link_ref(ref_map, tail);
1866 1867 1868

	return 0;
}
1869 1870 1871 1872 1873 1874 1875

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)) {
1876
			oidcpy(&ref->old_oid, &list->old_oid);
1877 1878 1879 1880
			return 0;
		}
	return 1;
}
1881 1882

/*
1883 1884 1885 1886 1887 1888 1889 1890 1891 1892
 * 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.
1893
 *
1894
 * Returns -1 if num_ours and num_theirs could not be filled in (e.g., no
1895 1896
 * upstream defined, or ref does not exist).  Returns 0 if the commits are
 * identical.  Returns 1 if commits are different.
1897
 */
1898
int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs,
1899
		       const char **upstream_name, enum ahead_behind_flags abf)
1900
{
1901
	struct object_id oid;
1902 1903
	struct commit *ours, *theirs;
	struct rev_info revs;
1904 1905
	const char *base;
	struct argv_array argv = ARGV_ARRAY_INIT;
1906

1907
	/* Cannot stat unless we are marked to build on top of somebody else. */
1908
	base = branch_get_upstream(branch, NULL);
1909 1910
	if (upstream_name)
		*upstream_name = base;
1911
	if (!base)
1912
		return -1;
1913

1914
	/* Cannot stat if what we used to build on no longer exists */
1915
	if (read_ref(base, &oid))
1916
		return -1;
1917
	theirs = lookup_commit_reference(the_repository, &oid);
1918
	if (!theirs)
1919
		return -1;
1920

1921
	if (read_ref(branch->refname, &oid))
1922
		return -1;
1923
	ours = lookup_commit_reference(the_repository, &oid);
1924
	if (!ours)
1925
		return -1;
1926

1927 1928
	*num_theirs = *num_ours = 0;

1929
	/* are we the same? */
1930
	if (theirs == ours)
1931
		return 0;
1932 1933
	if (abf == AHEAD_BEHIND_QUICK)
		return 1;
1934 1935
	if (abf != AHEAD_BEHIND_FULL)
		BUG("stat_tracking_info: invalid abf '%d'", abf);
1936

1937
	/* Run "rev-list --left-right ours...theirs" internally... */
1938 1939 1940
	argv_array_push(&argv, ""); /* ignored */
	argv_array_push(&argv, "--left-right");
	argv_array_pushf(&argv, "%s...%s",
1941 1942
			 oid_to_hex(&ours->object.oid),
			 oid_to_hex(&theirs->object.oid));
1943
	argv_array_push(&argv, "--");
1944

1945
	repo_init_revisions(the_repository, &revs, NULL);
1946
	setup_revisions(argv.argc, argv.argv, &revs, NULL);
1947
	if (prepare_revision_walk(&revs))
1948
		die(_("revision walk setup failed"));
1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959

	/* ... 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)++;
	}
1960 1961 1962 1963

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

	argv_array_clear(&argv);
1966
	return 1;
1967 1968 1969 1970 1971
}

/*
 * Return true when there is anything to report, otherwise false.
 */
1972 1973
int format_tracking_info(struct branch *branch, struct strbuf *sb,
			 enum ahead_behind_flags abf)
1974
{
1975
	int ours, theirs, sti;
1976
	const char *full_base;
1977
	char *base;
1978
	int upstream_is_gone = 0;
1979

1980 1981
	sti = stat_tracking_info(branch, &ours, &theirs, &full_base, abf);
	if (sti < 0) {
1982 1983
		if (!full_base)
			return 0;
1984 1985
		upstream_is_gone = 1;
	}
1986

1987
	base = shorten_unambiguous_ref(full_base, 0);
1988 1989 1990 1991 1992
	if (upstream_is_gone) {
		strbuf_addf(sb,
			_("Your branch is based on '%s', but the upstream is gone.\n"),
			base);
		if (advice_status_hints)
1993
			strbuf_addstr(sb,
1994
				_("  (use \"git branch --unset-upstream\" to fixup)\n"));
1995
	} else if (!sti) {
1996
		strbuf_addf(sb,
1997
			_("Your branch is up to date with '%s'.\n"),
1998
			base);
1999 2000 2001 2002 2003 2004 2005
	} 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");
2006
	} else if (!theirs) {
2007 2008 2009
		strbuf_addf(sb,
			Q_("Your branch is ahead of '%s' by %d commit.\n",
			   "Your branch is ahead of '%s' by %d commits.\n",
2010 2011
			   ours),
			base, ours);
2012
		if (advice_status_hints)
2013
			strbuf_addstr(sb,
2014
				_("  (use \"git push\" to publish your local commits)\n"));
2015
	} else if (!ours) {
2016 2017 2018 2019 2020
		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",
2021 2022
			   theirs),
			base, theirs);
2023
		if (advice_status_hints)
2024
			strbuf_addstr(sb,
2025
				_("  (use \"git pull\" to update your local branch)\n"));
2026
	} else {
2027 2028 2029 2030 2031 2032 2033
		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",
2034
			   ours + theirs),
2035
			base, ours, theirs);
2036
		if (advice_status_hints)
2037
			strbuf_addstr(sb,
2038
				_("  (use \"git pull\" to merge the remote branch into yours)\n"));
2039
	}
2040
	free(base);
2041 2042
	return 1;
}
2043

2044 2045
static int one_local_ref(const char *refname, const struct object_id *oid,
			 int flag, void *cb_data)
2046 2047 2048 2049 2050
{
	struct ref ***local_tail = cb_data;
	struct ref *ref;

	/* we already know it starts with refs/ to get here */
2051
	if (check_refname_format(refname + 5, 0))
2052 2053
		return 0;

2054
	ref = alloc_ref(refname);
2055
	oidcpy(&ref->new_oid, oid);
2056 2057 2058 2059 2060 2061 2062
	**local_tail = ref;
	*local_tail = &ref->next;
	return 0;
}

struct ref *get_local_heads(void)
{
2063
	struct ref *local_refs = NULL, **local_tail = &local_refs;
2064

2065 2066 2067
	for_each_ref(one_local_ref, &local_tail);
	return local_refs;
}
J
Jay Soffian 已提交
2068

2069 2070 2071
struct ref *guess_remote_head(const struct ref *head,
			      const struct ref *refs,
			      int all)
J
Jay Soffian 已提交
2072 2073
{
	const struct ref *r;
2074 2075
	struct ref *list = NULL;
	struct ref **tail = &list;
J
Jay Soffian 已提交
2076

2077
	if (!head)
J
Jay Soffian 已提交
2078 2079
		return NULL;

2080 2081 2082 2083 2084 2085 2086 2087
	/*
	 * 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 已提交
2088
	/* If refs/heads/master could be right, it is. */
2089 2090
	if (!all) {
		r = find_ref_by_name(refs, "refs/heads/master");
J
Jeff King 已提交
2091
		if (r && oideq(&r->old_oid, &head->old_oid))
2092 2093
			return copy_ref(r);
	}
J
Jay Soffian 已提交
2094 2095

	/* Look for another ref that points there */
2096
	for (r = refs; r; r = r->next) {
2097
		if (r != head &&
2098
		    starts_with(r->name, "refs/heads/") &&
J
Jeff King 已提交
2099
		    oideq(&r->old_oid, &head->old_oid)) {
2100 2101 2102 2103 2104 2105
			*tail = copy_ref(r);
			tail = &((*tail)->next);
			if (!all)
				break;
		}
	}
J
Jay Soffian 已提交
2106

2107
	return list;
J
Jay Soffian 已提交
2108
}
2109 2110 2111 2112

struct stale_heads_info {
	struct string_list *ref_names;
	struct ref **stale_refs_tail;
2113
	struct refspec *rs;
2114 2115
};

2116 2117
static int get_stale_heads_cb(const char *refname, const struct object_id *oid,
			      int flags, void *cb_data)
2118 2119
{
	struct stale_heads_info *info = cb_data;
2120
	struct string_list matches = STRING_LIST_INIT_DUP;
2121
	struct refspec_item query;
2122
	int i, stale = 1;
2123
	memset(&query, 0, sizeof(struct refspec_item));
2124 2125
	query.dst = (char *)refname;

2126
	query_refspecs_multiple(info->rs, &query, &matches);
2127 2128
	if (matches.nr == 0)
		goto clean_exit; /* No matches */
2129 2130 2131 2132

	/*
	 * 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
2133 2134 2135
	 * remote, we consider it to be stale. In order to deal with
	 * overlapping refspecs, we need to go over all of the
	 * matching refs.
2136
	 */
2137 2138 2139 2140 2141 2142 2143 2144
	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) {
2145
		struct ref *ref = make_linked_ref(refname, &info->stale_refs_tail);
2146
		oidcpy(&ref->new_oid, oid);
2147
	}
2148

2149 2150
clean_exit:
	string_list_clear(&matches, 0);
2151 2152 2153
	return 0;
}

2154
struct ref *get_stale_heads(struct refspec *rs, struct ref *fetch_map)
2155 2156
{
	struct ref *ref, *stale_refs = NULL;
2157
	struct string_list ref_names = STRING_LIST_INIT_NODUP;
2158
	struct stale_heads_info info;
2159

2160 2161
	info.ref_names = &ref_names;
	info.stale_refs_tail = &stale_refs;
2162
	info.rs = rs;
2163
	for (ref = fetch_map; ref; ref = ref->next)
2164
		string_list_append(&ref_names, ref->name);
2165
	string_list_sort(&ref_names);
2166 2167 2168 2169
	for_each_ref(get_stale_heads_cb, &info);
	string_list_clear(&ref_names, 0);
	return stale_refs;
}
2170 2171 2172 2173

/*
 * Compare-and-swap
 */
2174
static void clear_cas_option(struct push_cas_option *cas)
2175 2176 2177 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 2190 2191 2192 2193 2194 2195
{
	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;
}

2196
static int parse_push_cas_option(struct push_cas_option *cas, const char *arg, int unset)
2197 2198 2199 2200 2201 2202 2203 2204 2205 2206 2207 2208 2209 2210 2211 2212 2213 2214 2215 2216 2217
{
	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;
2218
	else if (!colon[1])
2219 2220
		oidclr(&entry->expect);
	else if (get_oid(colon + 1, &entry->expect))
2221 2222
		return error(_("cannot parse expected object name '%s'"),
			     colon + 1);
2223 2224 2225 2226 2227 2228 2229
	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);
}
2230 2231 2232 2233 2234 2235 2236 2237 2238 2239 2240 2241 2242

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,
2243
			   struct object_id *oid)
2244 2245 2246
{
	char *dst;

2247
	dst = apply_refspecs(&remote->fetch, refname);
2248 2249
	if (!dst)
		return -1; /* no tracking ref for refname at remote */
2250
	if (read_ref(dst, oid))
2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263
		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];
2264
		if (!refname_match(entry->refname, ref->name))
2265 2266 2267
			continue;
		ref->expect_old_sha1 = 1;
		if (!entry->use_tracking)
2268
			oidcpy(&ref->old_oid_expect, &entry->expect);
2269
		else if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
2270
			oidclr(&ref->old_oid_expect);
2271 2272 2273 2274 2275 2276 2277 2278
		return;
	}

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

	ref->expect_old_sha1 = 1;
2279
	if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
2280
		oidclr(&ref->old_oid_expect);
2281 2282 2283 2284 2285 2286 2287 2288 2289 2290
}

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