fetch.c 27.3 KB
Newer Older
D
Daniel Barkalow 已提交
1 2 3 4 5 6 7
/*
 * "git fetch"
 */
#include "cache.h"
#include "refs.h"
#include "commit.h"
#include "builtin.h"
8
#include "string-list.h"
D
Daniel Barkalow 已提交
9 10
#include "remote.h"
#include "transport.h"
11
#include "run-command.h"
12
#include "parse-options.h"
13
#include "sigchain.h"
14
#include "transport.h"
15
#include "submodule.h"
16
#include "connected.h"
D
Daniel Barkalow 已提交
17

18
static const char * const builtin_fetch_usage[] = {
T
Tay Ray Chuan 已提交
19 20
	"git fetch [<options>] [<repository> [<refspec>...]]",
	"git fetch [<options>] <group>",
21
	"git fetch --multiple [<options>] [(<repository> | <group>)...]",
T
Tay Ray Chuan 已提交
22
	"git fetch --all [<options>]",
23 24
	NULL
};
D
Daniel Barkalow 已提交
25

26 27 28 29 30 31
enum {
	TAGS_UNSET = 0,
	TAGS_DEFAULT = 1,
	TAGS_SET = 2
};

J
Jay Soffian 已提交
32
static int all, append, dry_run, force, keep, multiple, prune, update_head_ok, verbosity;
33
static int progress, recurse_submodules = RECURSE_SUBMODULES_DEFAULT;
34
static int tags = TAGS_DEFAULT;
35
static const char *depth;
36
static const char *upload_pack;
37
static struct strbuf default_rla = STRBUF_INIT;
38
static struct transport *transport;
39
static const char *submodule_prefix = "";
40
static const char *recurse_submodules_default;
41

42 43 44 45 46 47 48 49 50 51 52 53 54
static int option_parse_recurse_submodules(const struct option *opt,
				   const char *arg, int unset)
{
	if (unset) {
		recurse_submodules = RECURSE_SUBMODULES_OFF;
	} else {
		if (arg)
			recurse_submodules = parse_fetch_recurse_submodules_arg(opt->long_name, arg);
		else
			recurse_submodules = RECURSE_SUBMODULES_ON;
	}
	return 0;
}
55

56
static struct option builtin_fetch_options[] = {
T
Tuncer Ayaz 已提交
57
	OPT__VERBOSITY(&verbosity),
58 59
	OPT_BOOLEAN(0, "all", &all,
		    "fetch from all remotes"),
60 61
	OPT_BOOLEAN('a', "append", &append,
		    "append to .git/FETCH_HEAD instead of overwriting"),
62
	OPT_STRING(0, "upload-pack", &upload_pack, "path",
63
		   "path to upload pack on remote end"),
R
René Scharfe 已提交
64
	OPT__FORCE(&force, "force overwrite of local branch"),
65 66
	OPT_BOOLEAN('m', "multiple", &multiple,
		    "fetch from multiple remotes"),
67 68
	OPT_SET_INT('t', "tags", &tags,
		    "fetch all tags and associated objects", TAGS_SET),
69 70
	OPT_SET_INT('n', NULL, &tags,
		    "do not fetch all tags (--no-tags)", TAGS_UNSET),
J
Jay Soffian 已提交
71
	OPT_BOOLEAN('p', "prune", &prune,
72
		    "prune remote-tracking branches no longer on remote"),
73
	{ OPTION_CALLBACK, 0, "recurse-submodules", NULL, "on-demand",
74
		    "control recursive fetching of submodules",
75
		    PARSE_OPT_OPTARG, option_parse_recurse_submodules },
J
Jay Soffian 已提交
76 77
	OPT_BOOLEAN(0, "dry-run", &dry_run,
		    "dry run"),
78 79 80
	OPT_BOOLEAN('k', "keep", &keep, "keep downloaded pack"),
	OPT_BOOLEAN('u', "update-head-ok", &update_head_ok,
		    "allow updating of HEAD ref"),
T
Tay Ray Chuan 已提交
81
	OPT_BOOLEAN(0, "progress", &progress, "force progress reporting"),
82
	OPT_STRING(0, "depth", &depth, "depth",
83
		   "deepen history of shallow clone"),
84
	{ OPTION_STRING, 0, "submodule-prefix", &submodule_prefix, "dir",
85
		   "prepend this to submodule path output", PARSE_OPT_HIDDEN },
86 87 88
	{ OPTION_STRING, 0, "recurse-submodules-default",
		   &recurse_submodules_default, NULL,
		   "default mode for recursion", PARSE_OPT_HIDDEN },
89 90 91
	OPT_END()
};

92 93 94 95 96 97 98 99 100
static void unlock_pack(void)
{
	if (transport)
		transport_unlock_pack(transport);
}

static void unlock_pack_on_signal(int signo)
{
	unlock_pack();
101
	sigchain_pop(signo);
102 103
	raise(signo);
}
D
Daniel Barkalow 已提交
104

105
static void add_merge_config(struct ref **head,
106
			   const struct ref *remote_refs,
107 108
		           struct branch *branch,
		           struct ref ***tail)
D
Daniel Barkalow 已提交
109
{
110
	int i;
D
Daniel Barkalow 已提交
111

112 113 114 115 116 117
	for (i = 0; i < branch->merge_nr; i++) {
		struct ref *rm, **old_tail = *tail;
		struct refspec refspec;

		for (rm = *head; rm; rm = rm->next) {
			if (branch_merge_matches(branch, i, rm->name)) {
D
Daniel Barkalow 已提交
118
				rm->merge = 1;
119 120
				break;
			}
D
Daniel Barkalow 已提交
121
		}
122 123 124
		if (rm)
			continue;

125
		/*
126
		 * Not fetched to a remote-tracking branch?  We need to fetch
127
		 * it anyway to allow this branch's "branch.$name.merge"
128
		 * to be honored by 'git pull', but we do not have to
129 130
		 * fail if branch.$name.merge is misconfigured to point
		 * at a nonexisting branch.  If we were indeed called by
131
		 * 'git pull', it will notice the misconfiguration because
132 133
		 * there is no entry in the resulting FETCH_HEAD marked
		 * for merging.
134
		 */
135
		memset(&refspec, 0, sizeof(refspec));
136
		refspec.src = branch->merge[i]->src;
137
		get_fetch_map(remote_refs, &refspec, tail, 1);
138 139
		for (rm = *old_tail; rm; rm = rm->next)
			rm->merge = 1;
D
Daniel Barkalow 已提交
140 141 142
	}
}

143 144 145 146
static void find_non_local_tags(struct transport *transport,
			struct ref **head,
			struct ref ***tail);

D
Daniel Barkalow 已提交
147 148 149 150 151 152 153 154 155
static struct ref *get_ref_map(struct transport *transport,
			       struct refspec *refs, int ref_count, int tags,
			       int *autotags)
{
	int i;
	struct ref *rm;
	struct ref *ref_map = NULL;
	struct ref **tail = &ref_map;

156
	const struct ref *remote_refs = transport_get_remote_refs(transport);
D
Daniel Barkalow 已提交
157

158
	if (ref_count || tags == TAGS_SET) {
D
Daniel Barkalow 已提交
159
		for (i = 0; i < ref_count; i++) {
160
			get_fetch_map(remote_refs, &refs[i], &tail, 0);
D
Daniel Barkalow 已提交
161 162 163 164 165 166
			if (refs[i].dst && refs[i].dst[0])
				*autotags = 1;
		}
		/* Merge everything on the command line, but not --tags */
		for (rm = ref_map; rm; rm = rm->next)
			rm->merge = 1;
167 168
		if (tags == TAGS_SET)
			get_fetch_map(remote_refs, tag_refspec, &tail, 0);
D
Daniel Barkalow 已提交
169 170 171
	} else {
		/* Use the defaults */
		struct remote *remote = transport->remote;
172 173
		struct branch *branch = branch_get(NULL);
		int has_merge = branch_has_merge_config(branch);
174 175
		if (remote &&
		    (remote->fetch_refspec_nr ||
176
		     /* Note: has_merge implies non-NULL branch->remote_name */
177
		     (has_merge && !strcmp(branch->remote_name, remote->name)))) {
D
Daniel Barkalow 已提交
178
			for (i = 0; i < remote->fetch_refspec_nr; i++) {
179
				get_fetch_map(remote_refs, &remote->fetch[i], &tail, 0);
D
Daniel Barkalow 已提交
180 181 182
				if (remote->fetch[i].dst &&
				    remote->fetch[i].dst[0])
					*autotags = 1;
183
				if (!i && !has_merge && ref_map &&
184
				    !remote->fetch[0].pattern)
185
					ref_map->merge = 1;
D
Daniel Barkalow 已提交
186
			}
187 188 189 190
			/*
			 * if the remote we're fetching from is the same
			 * as given in branch.<name>.remote, we add the
			 * ref given in branch.<name>.merge, too.
191 192
			 *
			 * Note: has_merge implies non-NULL branch->remote_name
193
			 */
194 195
			if (has_merge &&
			    !strcmp(branch->remote_name, remote->name))
196
				add_merge_config(&ref_map, remote_refs, branch, &tail);
D
Daniel Barkalow 已提交
197 198
		} else {
			ref_map = get_remote_ref(remote_refs, "HEAD");
199
			if (!ref_map)
200
				die(_("Couldn't find remote ref HEAD"));
D
Daniel Barkalow 已提交
201
			ref_map->merge = 1;
202
			tail = &ref_map->next;
D
Daniel Barkalow 已提交
203 204
		}
	}
205 206
	if (tags == TAGS_DEFAULT && *autotags)
		find_non_local_tags(transport, &ref_map, &tail);
207
	ref_remove_duplicates(ref_map);
D
Daniel Barkalow 已提交
208 209 210 211

	return ref_map;
}

212 213 214
#define STORE_REF_ERROR_OTHER 1
#define STORE_REF_ERROR_DF_CONFLICT 2

D
Daniel Barkalow 已提交
215 216 217 218 219 220 221 222
static int s_update_ref(const char *action,
			struct ref *ref,
			int check_old)
{
	char msg[1024];
	char *rla = getenv("GIT_REFLOG_ACTION");
	static struct ref_lock *lock;

J
Jay Soffian 已提交
223 224
	if (dry_run)
		return 0;
D
Daniel Barkalow 已提交
225
	if (!rla)
226
		rla = default_rla.buf;
D
Daniel Barkalow 已提交
227 228 229 230
	snprintf(msg, sizeof(msg), "%s: %s", rla, action);
	lock = lock_any_ref_for_update(ref->name,
				       check_old ? ref->old_sha1 : NULL, 0);
	if (!lock)
231 232
		return errno == ENOTDIR ? STORE_REF_ERROR_DF_CONFLICT :
					  STORE_REF_ERROR_OTHER;
D
Daniel Barkalow 已提交
233
	if (write_ref_sha1(lock, ref->new_sha1, msg) < 0)
234 235
		return errno == ENOTDIR ? STORE_REF_ERROR_DF_CONFLICT :
					  STORE_REF_ERROR_OTHER;
D
Daniel Barkalow 已提交
236 237 238
	return 0;
}

P
Pierre Habouzit 已提交
239
#define REFCOL_WIDTH  10
N
Nicolas Pitre 已提交
240

D
Daniel Barkalow 已提交
241
static int update_local_ref(struct ref *ref,
N
Nicolas Pitre 已提交
242
			    const char *remote,
243
			    struct strbuf *display)
D
Daniel Barkalow 已提交
244 245 246 247
{
	struct commit *current = NULL, *updated;
	enum object_type type;
	struct branch *current_branch = branch_get(NULL);
248
	const char *pretty_ref = prettify_refname(ref->name);
D
Daniel Barkalow 已提交
249 250 251

	type = sha1_object_info(ref->new_sha1, NULL);
	if (type < 0)
252
		die(_("object %s not found"), sha1_to_hex(ref->new_sha1));
D
Daniel Barkalow 已提交
253 254

	if (!hashcmp(ref->old_sha1, ref->new_sha1)) {
T
Tuncer Ayaz 已提交
255
		if (verbosity > 0)
256 257 258 259
			strbuf_addf(display, "= %-*s %-*s -> %s",
				    TRANSPORT_SUMMARY_WIDTH,
				    _("[up to date]"), REFCOL_WIDTH,
				    remote, pretty_ref);
D
Daniel Barkalow 已提交
260 261 262
		return 0;
	}

263 264
	if (current_branch &&
	    !strcmp(ref->name, current_branch->name) &&
D
Daniel Barkalow 已提交
265 266 267 268 269 270
	    !(update_head_ok || is_bare_repository()) &&
	    !is_null_sha1(ref->old_sha1)) {
		/*
		 * If this is the head, and it's not okay to update
		 * the head, and the old value of the head isn't empty...
		 */
271 272 273 274
		strbuf_addf(display,
			    _("! %-*s %-*s -> %s  (can't fetch in current branch)"),
			    TRANSPORT_SUMMARY_WIDTH, _("[rejected]"),
			    REFCOL_WIDTH, remote, pretty_ref);
D
Daniel Barkalow 已提交
275 276 277 278 279
		return 1;
	}

	if (!is_null_sha1(ref->old_sha1) &&
	    !prefixcmp(ref->name, "refs/tags/")) {
280 281
		int r;
		r = s_update_ref("updating tag", ref, 0);
282 283 284 285 286
		strbuf_addf(display, "%c %-*s %-*s -> %s%s",
			    r ? '!' : '-',
			    TRANSPORT_SUMMARY_WIDTH, _("[tag update]"),
			    REFCOL_WIDTH, remote, pretty_ref,
			    r ? _("  (unable to update local ref)") : "");
287
		return r;
D
Daniel Barkalow 已提交
288 289
	}

290 291
	current = lookup_commit_reference_gently(ref->old_sha1, 1);
	updated = lookup_commit_reference_gently(ref->new_sha1, 1);
D
Daniel Barkalow 已提交
292
	if (!current || !updated) {
N
Nicolas Pitre 已提交
293 294
		const char *msg;
		const char *what;
295
		int r;
N
Nicolas Pitre 已提交
296
		if (!strncmp(ref->name, "refs/tags/", 10)) {
D
Daniel Barkalow 已提交
297
			msg = "storing tag";
298
			what = _("[new tag]");
N
Nicolas Pitre 已提交
299 300
		}
		else {
D
Daniel Barkalow 已提交
301
			msg = "storing head";
302
			what = _("[new branch]");
303 304 305
			if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
			    (recurse_submodules != RECURSE_SUBMODULES_ON))
				check_for_new_submodule_commits(ref->new_sha1);
N
Nicolas Pitre 已提交
306 307
		}

308
		r = s_update_ref(msg, ref, 0);
309 310 311 312 313
		strbuf_addf(display, "%c %-*s %-*s -> %s%s",
			    r ? '!' : '*',
			    TRANSPORT_SUMMARY_WIDTH, what,
			    REFCOL_WIDTH, remote, pretty_ref,
			    r ? _("  (unable to update local ref)") : "");
314
		return r;
D
Daniel Barkalow 已提交
315 316 317
	}

	if (in_merge_bases(current, &updated, 1)) {
N
Nicolas Pitre 已提交
318
		char quickref[83];
319
		int r;
N
Nicolas Pitre 已提交
320 321 322
		strcpy(quickref, find_unique_abbrev(current->object.sha1, DEFAULT_ABBREV));
		strcat(quickref, "..");
		strcat(quickref, find_unique_abbrev(ref->new_sha1, DEFAULT_ABBREV));
323 324 325
		if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
		    (recurse_submodules != RECURSE_SUBMODULES_ON))
			check_for_new_submodule_commits(ref->new_sha1);
326
		r = s_update_ref("fast-forward", ref, 1);
327 328 329 330 331
		strbuf_addf(display, "%c %-*s %-*s -> %s%s",
			    r ? '!' : ' ',
			    TRANSPORT_SUMMARY_WIDTH, quickref,
			    REFCOL_WIDTH, remote, pretty_ref,
			    r ? _("  (unable to update local ref)") : "");
332
		return r;
N
Nicolas Pitre 已提交
333 334
	} else if (force || ref->force) {
		char quickref[84];
335
		int r;
N
Nicolas Pitre 已提交
336 337 338
		strcpy(quickref, find_unique_abbrev(current->object.sha1, DEFAULT_ABBREV));
		strcat(quickref, "...");
		strcat(quickref, find_unique_abbrev(ref->new_sha1, DEFAULT_ABBREV));
339 340 341
		if ((recurse_submodules != RECURSE_SUBMODULES_OFF) &&
		    (recurse_submodules != RECURSE_SUBMODULES_ON))
			check_for_new_submodule_commits(ref->new_sha1);
342
		r = s_update_ref("forced-update", ref, 1);
343 344 345 346 347
		strbuf_addf(display, "%c %-*s %-*s -> %s  (%s)",
			    r ? '!' : '+',
			    TRANSPORT_SUMMARY_WIDTH, quickref,
			    REFCOL_WIDTH, remote, pretty_ref,
			    r ? _("unable to update local ref") : _("forced update"));
348
		return r;
N
Nicolas Pitre 已提交
349
	} else {
350 351 352 353
		strbuf_addf(display, "! %-*s %-*s -> %s  %s",
			    TRANSPORT_SUMMARY_WIDTH, _("[rejected]"),
			    REFCOL_WIDTH, remote, pretty_ref,
			    _("(non-fast-forward)"));
D
Daniel Barkalow 已提交
354 355 356 357
		return 1;
	}
}

358
static int iterate_ref_map(void *cb_data, unsigned char sha1[20])
359
{
360 361
	struct ref **rm = cb_data;
	struct ref *ref = *rm;
362

363 364 365 366 367
	if (!ref)
		return -1; /* end of the list */
	*rm = ref->next;
	hashcpy(sha1, ref->old_sha1);
	return 0;
368 369
}

370
static int store_updated_refs(const char *raw_url, const char *remote_name,
371
		struct ref *ref_map)
D
Daniel Barkalow 已提交
372 373 374
{
	FILE *fp;
	struct commit *commit;
375 376
	int url_len, i, shown_url = 0, rc = 0;
	struct strbuf note = STRBUF_INIT;
D
Daniel Barkalow 已提交
377 378
	const char *what, *kind;
	struct ref *rm;
J
Jay Soffian 已提交
379
	char *url, *filename = dry_run ? "/dev/null" : git_path("FETCH_HEAD");
D
Daniel Barkalow 已提交
380

381 382
	fp = fopen(filename, "a");
	if (!fp)
383
		return error(_("cannot open %s: %s\n"), filename, strerror(errno));
384

385 386 387 388
	if (raw_url)
		url = transport_anonymize_url(raw_url);
	else
		url = xstrdup("foreign");
389

390
	rm = ref_map;
J
Junio C Hamano 已提交
391
	if (check_everything_connected(iterate_ref_map, 0, &rm)) {
392 393 394
		rc = error(_("%s did not send all necessary objects\n"), url);
		goto abort;
	}
395

D
Daniel Barkalow 已提交
396 397 398 399 400 401 402 403
	for (rm = ref_map; rm; rm = rm->next) {
		struct ref *ref = NULL;

		if (rm->peer_ref) {
			ref = xcalloc(1, sizeof(*ref) + strlen(rm->peer_ref->name) + 1);
			strcpy(ref->name, rm->peer_ref->name);
			hashcpy(ref->old_sha1, rm->peer_ref->old_sha1);
			hashcpy(ref->new_sha1, rm->old_sha1);
404
			ref->force = rm->peer_ref->force;
D
Daniel Barkalow 已提交
405 406
		}

407
		commit = lookup_commit_reference_gently(rm->old_sha1, 1);
D
Daniel Barkalow 已提交
408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423
		if (!commit)
			rm->merge = 0;

		if (!strcmp(rm->name, "HEAD")) {
			kind = "";
			what = "";
		}
		else if (!prefixcmp(rm->name, "refs/heads/")) {
			kind = "branch";
			what = rm->name + 11;
		}
		else if (!prefixcmp(rm->name, "refs/tags/")) {
			kind = "tag";
			what = rm->name + 10;
		}
		else if (!prefixcmp(rm->name, "refs/remotes/")) {
424
			kind = "remote-tracking branch";
D
Daniel Barkalow 已提交
425 426 427 428 429 430 431 432 433 434 435 436 437 438
			what = rm->name + 13;
		}
		else {
			kind = "";
			what = rm->name;
		}

		url_len = strlen(url);
		for (i = url_len - 1; url[i] == '/' && 0 <= i; i--)
			;
		url_len = i + 1;
		if (4 < i && !strncmp(".git", url + i - 3, 4))
			url_len = i - 3;

439
		strbuf_reset(&note);
D
Daniel Barkalow 已提交
440 441
		if (*what) {
			if (*kind)
442 443
				strbuf_addf(&note, "%s ", kind);
			strbuf_addf(&note, "'%s' of ", what);
D
Daniel Barkalow 已提交
444
		}
445
		fprintf(fp, "%s\t%s\t%s",
D
Daniel Barkalow 已提交
446 447 448
			sha1_to_hex(commit ? commit->object.sha1 :
				    rm->old_sha1),
			rm->merge ? "" : "not-for-merge",
449
			note.buf);
450 451 452 453 454 455
		for (i = 0; i < url_len; ++i)
			if ('\n' == url[i])
				fputs("\\n", fp);
			else
				fputc(url[i], fp);
		fputc('\n', fp);
D
Daniel Barkalow 已提交
456

457
		strbuf_reset(&note);
458
		if (ref) {
459
			rc |= update_local_ref(ref, what, &note);
460 461
			free(ref);
		} else
462 463 464 465 466 467
			strbuf_addf(&note, "* %-*s %-*s -> FETCH_HEAD",
				    TRANSPORT_SUMMARY_WIDTH,
				    *kind ? kind : "branch",
				    REFCOL_WIDTH,
				    *what ? what : "HEAD");
		if (note.len) {
T
Tuncer Ayaz 已提交
468
			if (verbosity >= 0 && !shown_url) {
469
				fprintf(stderr, _("From %.*s\n"),
470 471
						url_len, url);
				shown_url = 1;
N
Nicolas Pitre 已提交
472
			}
T
Tuncer Ayaz 已提交
473
			if (verbosity >= 0)
474
				fprintf(stderr, " %s\n", note.buf);
N
Nicolas Pitre 已提交
475
		}
D
Daniel Barkalow 已提交
476
	}
477

478
	if (rc & STORE_REF_ERROR_DF_CONFLICT)
479
		error(_("some local refs could not be updated; try running\n"
480
		      " 'git remote prune %s' to remove any old, conflicting "
481
		      "branches"), remote_name);
482 483

 abort:
484
	strbuf_release(&note);
485 486
	free(url);
	fclose(fp);
487
	return rc;
D
Daniel Barkalow 已提交
488 489
}

490 491
/*
 * We would want to bypass the object transfer altogether if
492
 * everything we are going to fetch already exists and is connected
493 494 495 496
 * locally.
 */
static int quickfetch(struct ref *ref_map)
{
497 498
	struct ref *rm = ref_map;

499 500 501 502 503 504 505 506 507
	/*
	 * If we are deepening a shallow clone we already have these
	 * objects reachable.  Running rev-list here will return with
	 * a good (0) exit status and we'll bypass the fetch that we
	 * really need to perform.  Claiming failure now will ensure
	 * we perform the network exchange to deepen our history.
	 */
	if (depth)
		return -1;
508
	return check_everything_connected(iterate_ref_map, 1, &rm);
509 510
}

D
Daniel Barkalow 已提交
511 512
static int fetch_refs(struct transport *transport, struct ref *ref_map)
{
513 514 515
	int ret = quickfetch(ref_map);
	if (ret)
		ret = transport_fetch_refs(transport, ref_map);
D
Daniel Barkalow 已提交
516
	if (!ret)
517 518 519
		ret |= store_updated_refs(transport->url,
				transport->remote->name,
				ref_map);
520
	transport_unlock_pack(transport);
D
Daniel Barkalow 已提交
521 522 523
	return ret;
}

524
static int prune_refs(struct refspec *refs, int ref_count, struct ref *ref_map)
J
Jay Soffian 已提交
525 526
{
	int result = 0;
527
	struct ref *ref, *stale_refs = get_stale_heads(refs, ref_count, ref_map);
J
Jay Soffian 已提交
528
	const char *dangling_msg = dry_run
529 530
		? _("   (%s will become dangling)\n")
		: _("   (%s has become dangling)\n");
J
Jay Soffian 已提交
531 532 533 534 535 536

	for (ref = stale_refs; ref; ref = ref->next) {
		if (!dry_run)
			result |= delete_ref(ref->name, NULL, 0);
		if (verbosity >= 0) {
			fprintf(stderr, " x %-*s %-*s -> %s\n",
537 538
				TRANSPORT_SUMMARY_WIDTH, _("[deleted]"),
				REFCOL_WIDTH, _("(none)"), prettify_refname(ref->name));
J
Jay Soffian 已提交
539 540 541 542 543 544 545
			warn_dangling_symref(stderr, dangling_msg, ref->name);
		}
	}
	free_refs(stale_refs);
	return result;
}

D
Daniel Barkalow 已提交
546 547 548
static int add_existing(const char *refname, const unsigned char *sha1,
			int flag, void *cbdata)
{
549
	struct string_list *list = (struct string_list *)cbdata;
550
	struct string_list_item *item = string_list_insert(list, refname);
551
	item->util = (void *)sha1;
D
Daniel Barkalow 已提交
552 553 554
	return 0;
}

555 556 557 558 559 560 561 562 563 564 565
static int will_fetch(struct ref **head, const unsigned char *sha1)
{
	struct ref *rm = *head;
	while (rm) {
		if (!hashcmp(rm->old_sha1, sha1))
			return 1;
		rm = rm->next;
	}
	return 0;
}

566 567 568
static void find_non_local_tags(struct transport *transport,
			struct ref **head,
			struct ref ***tail)
D
Daniel Barkalow 已提交
569
{
570 571
	struct string_list existing_refs = STRING_LIST_INIT_NODUP;
	struct string_list remote_refs = STRING_LIST_INIT_NODUP;
572
	const struct ref *ref;
573
	struct string_list_item *item = NULL;
D
Daniel Barkalow 已提交
574 575 576 577 578 579

	for_each_ref(add_existing, &existing_refs);
	for (ref = transport_get_remote_refs(transport); ref; ref = ref->next) {
		if (prefixcmp(ref->name, "refs/tags"))
			continue;

580 581 582 583 584 585
		/*
		 * The peeled ref always follows the matching base
		 * ref, so if we see a peeled ref that we don't want
		 * to fetch then we can mark the ref entry in the list
		 * as one to ignore by setting util to NULL.
		 */
586
		if (!suffixcmp(ref->name, "^{}")) {
587 588 589 590 591 592 593
			if (item && !has_sha1_file(ref->old_sha1) &&
			    !will_fetch(head, ref->old_sha1) &&
			    !has_sha1_file(item->util) &&
			    !will_fetch(head, item->util))
				item->util = NULL;
			item = NULL;
			continue;
D
Daniel Barkalow 已提交
594 595
		}

596 597 598 599 600 601 602 603 604
		/*
		 * If item is non-NULL here, then we previously saw a
		 * ref not followed by a peeled reference, so we need
		 * to check if it is a lightweight tag that we want to
		 * fetch.
		 */
		if (item && !has_sha1_file(item->util) &&
		    !will_fetch(head, item->util))
			item->util = NULL;
D
Daniel Barkalow 已提交
605

606
		item = NULL;
D
Daniel Barkalow 已提交
607

608 609 610 611 612
		/* skip duplicates and refs that we already have */
		if (string_list_has_string(&remote_refs, ref->name) ||
		    string_list_has_string(&existing_refs, ref->name))
			continue;

613
		item = string_list_insert(&remote_refs, ref->name);
614
		item->util = (void *)ref->old_sha1;
D
Daniel Barkalow 已提交
615
	}
616
	string_list_clear(&existing_refs, 0);
617 618 619 620 621 622 623 624 625 626

	/*
	 * We may have a final lightweight tag that needs to be
	 * checked to see if it needs fetching.
	 */
	if (item && !has_sha1_file(item->util) &&
	    !will_fetch(head, item->util))
		item->util = NULL;

	/*
627 628
	 * For all the tags in the remote_refs string list,
	 * add them to the list of refs to be fetched
629
	 */
630 631 632 633 634 635 636 637 638 639 640
	for_each_string_list_item(item, &remote_refs) {
		/* Unless we have already decided to ignore this item... */
		if (item->util)
		{
			struct ref *rm = alloc_ref(item->string);
			rm->peer_ref = alloc_ref(item->string);
			hashcpy(rm->old_sha1, item->util);
			**tail = rm;
			*tail = &rm->next;
		}
	}
641 642

	string_list_clear(&remote_refs, 0);
D
Daniel Barkalow 已提交
643 644
}

645 646 647 648 649 650 651 652 653 654
static void check_not_current_branch(struct ref *ref_map)
{
	struct branch *current_branch = branch_get(NULL);

	if (is_bare_repository() || !current_branch)
		return;

	for (; ref_map; ref_map = ref_map->next)
		if (ref_map->peer_ref && !strcmp(current_branch->refname,
					ref_map->peer_ref->name))
655 656
			die(_("Refusing to fetch into current branch %s "
			    "of non-bare repository"), current_branch->refname);
657 658
}

659 660 661 662 663 664
static int truncate_fetch_head(void)
{
	char *filename = git_path("FETCH_HEAD");
	FILE *fp = fopen(filename, "w");

	if (!fp)
665
		return error(_("cannot open %s: %s\n"), filename, strerror(errno));
666 667 668 669
	fclose(fp);
	return 0;
}

D
Daniel Barkalow 已提交
670 671 672
static int do_fetch(struct transport *transport,
		    struct refspec *refs, int ref_count)
{
673
	struct string_list existing_refs = STRING_LIST_INIT_NODUP;
674
	struct string_list_item *peer_item = NULL;
675
	struct ref *ref_map;
D
Daniel Barkalow 已提交
676 677
	struct ref *rm;
	int autotags = (transport->remote->fetch_tags == 1);
678 679 680

	for_each_ref(add_existing, &existing_refs);

681 682 683 684 685 686
	if (tags == TAGS_DEFAULT) {
		if (transport->remote->fetch_tags == 2)
			tags = TAGS_SET;
		if (transport->remote->fetch_tags == -1)
			tags = TAGS_UNSET;
	}
D
Daniel Barkalow 已提交
687

688
	if (!transport->get_refs_list || !transport->fetch)
689
		die(_("Don't know how to fetch from %s"), transport->url);
D
Daniel Barkalow 已提交
690 691

	/* if not appending, truncate FETCH_HEAD */
J
Jay Soffian 已提交
692
	if (!append && !dry_run) {
693 694 695
		int errcode = truncate_fetch_head();
		if (errcode)
			return errcode;
696
	}
D
Daniel Barkalow 已提交
697 698

	ref_map = get_ref_map(transport, refs, ref_count, tags, &autotags);
699 700
	if (!update_head_ok)
		check_not_current_branch(ref_map);
D
Daniel Barkalow 已提交
701 702

	for (rm = ref_map; rm; rm = rm->next) {
703
		if (rm->peer_ref) {
704 705
			peer_item = string_list_lookup(&existing_refs,
						       rm->peer_ref->name);
706 707 708 709
			if (peer_item)
				hashcpy(rm->peer_ref->old_sha1,
					peer_item->util);
		}
D
Daniel Barkalow 已提交
710 711
	}

712 713
	if (tags == TAGS_DEFAULT && autotags)
		transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, "1");
D
Daniel Barkalow 已提交
714 715 716 717
	if (fetch_refs(transport, ref_map)) {
		free_refs(ref_map);
		return 1;
	}
718
	if (prune) {
719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737
		/* If --tags was specified, pretend the user gave us the canonical tags refspec */
		if (tags == TAGS_SET) {
			const char *tags_str = "refs/tags/*:refs/tags/*";
			struct refspec *tags_refspec, *refspec;

			/* Copy the refspec and add the tags to it */
			refspec = xcalloc(ref_count + 1, sizeof(struct refspec));
			tags_refspec = parse_fetch_refspec(1, &tags_str);
			memcpy(refspec, refs, ref_count * sizeof(struct refspec));
			memcpy(&refspec[ref_count], tags_refspec, sizeof(struct refspec));
			ref_count++;

			prune_refs(refspec, ref_count, ref_map);

			ref_count--;
			/* The rest of the strings belong to fetch_one */
			free_refspec(1, tags_refspec);
			free(refspec);
		} else if (ref_count) {
738
			prune_refs(refs, ref_count, ref_map);
739
		} else {
740
			prune_refs(transport->remote->fetch, transport->remote->fetch_refspec_nr, ref_map);
741
		}
742
	}
743
	free_refs(ref_map);
D
Daniel Barkalow 已提交
744 745 746

	/* if neither --no-tags nor --tags was specified, do automated tag
	 * following ... */
747
	if (tags == TAGS_DEFAULT && autotags) {
748 749 750
		struct ref **tail = &ref_map;
		ref_map = NULL;
		find_non_local_tags(transport, &ref_map, &tail);
D
Daniel Barkalow 已提交
751
		if (ref_map) {
752
			transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, NULL);
D
Daniel Barkalow 已提交
753 754 755 756 757 758 759 760 761
			transport_set_option(transport, TRANS_OPT_DEPTH, "0");
			fetch_refs(transport, ref_map);
		}
		free_refs(ref_map);
	}

	return 0;
}

762 763 764 765
static void set_option(const char *name, const char *value)
{
	int r = transport_set_option(transport, name, value);
	if (r < 0)
766
		die(_("Option \"%s\" value \"%s\" is not valid for %s"),
767 768
			name, value, transport->url);
	if (r > 0)
769
		warning(_("Option \"%s\" is ignored for %s\n"),
770 771 772
			name, transport->url);
}

773 774 775
static int get_one_remote_for_fetch(struct remote *remote, void *priv)
{
	struct string_list *list = priv;
776
	if (!remote->skip_default_update)
777
		string_list_append(list, remote->name);
778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795
	return 0;
}

struct remote_group_data {
	const char *name;
	struct string_list *list;
};

static int get_remote_group(const char *key, const char *value, void *priv)
{
	struct remote_group_data *g = priv;

	if (!prefixcmp(key, "remotes.") &&
			!strcmp(key + 8, g->name)) {
		/* split list by white space */
		int space = strcspn(value, " \t\n");
		while (*value) {
			if (space > 1) {
796 797
				string_list_append(g->list,
						   xstrndup(value, space));
798 799 800 801 802 803 804 805 806 807 808 809
			}
			value += space + (value[space] != '\0');
			space = strcspn(value, " \t\n");
		}
	}

	return 0;
}

static int add_remote_or_group(const char *name, struct string_list *list)
{
	int prev_nr = list->nr;
810 811
	struct remote_group_data g;
	g.name = name; g.list = list;
812 813 814 815 816 817 818

	git_config(get_remote_group, &g);
	if (list->nr == prev_nr) {
		struct remote *remote;
		if (!remote_is_configured(name))
			return 0;
		remote = remote_get(name);
819
		string_list_append(list, remote->name);
820 821 822 823
	}
	return 1;
}

824
static void add_options_to_argv(int *argc, const char **argv)
825
{
J
Jay Soffian 已提交
826
	if (dry_run)
827
		argv[(*argc)++] = "--dry-run";
J
Jay Soffian 已提交
828
	if (prune)
829
		argv[(*argc)++] = "--prune";
830
	if (update_head_ok)
831
		argv[(*argc)++] = "--update-head-ok";
832
	if (force)
833
		argv[(*argc)++] = "--force";
834
	if (keep)
835
		argv[(*argc)++] = "--keep";
836
	if (recurse_submodules == RECURSE_SUBMODULES_ON)
837
		argv[(*argc)++] = "--recurse-submodules";
838 839
	else if (recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND)
		argv[(*argc)++] = "--recurse-submodules=on-demand";
840
	if (verbosity >= 2)
841
		argv[(*argc)++] = "-v";
842
	if (verbosity >= 1)
843
		argv[(*argc)++] = "-v";
844
	else if (verbosity < 0)
845 846 847 848 849 850 851 852 853 854 855
		argv[(*argc)++] = "-q";

}

static int fetch_multiple(struct string_list *list)
{
	int i, result = 0;
	const char *argv[12] = { "fetch", "--append" };
	int argc = 2;

	add_options_to_argv(&argc, argv);
856

857 858 859 860 861 862
	if (!append && !dry_run) {
		int errcode = truncate_fetch_head();
		if (errcode)
			return errcode;
	}

863 864 865
	for (i = 0; i < list->nr; i++) {
		const char *name = list->items[i].string;
		argv[argc] = name;
866
		argv[argc + 1] = NULL;
867
		if (verbosity >= 0)
868
			printf(_("Fetching %s\n"), name);
869
		if (run_command_v_opt(argv, RUN_GIT_CMD)) {
870
			error(_("Could not fetch %s"), name);
871 872 873 874 875 876 877 878
			result = 1;
		}
	}

	return result;
}

static int fetch_one(struct remote *remote, int argc, const char **argv)
D
Daniel Barkalow 已提交
879
{
880
	int i;
D
Daniel Barkalow 已提交
881
	static const char **refs = NULL;
J
Jim Meyering 已提交
882
	struct refspec *refspec;
D
Daniel Barkalow 已提交
883
	int ref_nr = 0;
884
	int exit_code;
D
Daniel Barkalow 已提交
885

886
	if (!remote)
887 888
		die(_("No remote repository specified.  Please, specify either a URL or a\n"
		    "remote name from which new revisions should be fetched."));
889

890
	transport = transport_get(remote, NULL);
T
Tay Ray Chuan 已提交
891
	transport_set_verbosity(transport, verbosity, progress);
D
Daniel Barkalow 已提交
892
	if (upload_pack)
893
		set_option(TRANS_OPT_UPLOADPACK, upload_pack);
D
Daniel Barkalow 已提交
894
	if (keep)
895 896 897
		set_option(TRANS_OPT_KEEP, "yes");
	if (depth)
		set_option(TRANS_OPT_DEPTH, depth);
D
Daniel Barkalow 已提交
898

899
	if (argc > 0) {
D
Daniel Barkalow 已提交
900
		int j = 0;
901
		refs = xcalloc(argc + 1, sizeof(const char *));
902
		for (i = 0; i < argc; i++) {
D
Daniel Barkalow 已提交
903 904 905
			if (!strcmp(argv[i], "tag")) {
				char *ref;
				i++;
906
				if (i >= argc)
907
					die(_("You need to specify a tag name."));
D
Daniel Barkalow 已提交
908 909 910 911 912 913 914 915 916 917 918 919 920
				ref = xmalloc(strlen(argv[i]) * 2 + 22);
				strcpy(ref, "refs/tags/");
				strcat(ref, argv[i]);
				strcat(ref, ":refs/tags/");
				strcat(ref, argv[i]);
				refs[j++] = ref;
			} else
				refs[j++] = argv[i];
		}
		refs[j] = NULL;
		ref_nr = j;
	}

921
	sigchain_push_common(unlock_pack_on_signal);
922
	atexit(unlock_pack);
J
Jim Meyering 已提交
923 924
	refspec = parse_fetch_refspec(ref_nr, refs);
	exit_code = do_fetch(transport, refspec, ref_nr);
925
	free_refspec(ref_nr, refspec);
926 927 928
	transport_disconnect(transport);
	transport = NULL;
	return exit_code;
D
Daniel Barkalow 已提交
929
}
930 931 932 933

int cmd_fetch(int argc, const char **argv, const char *prefix)
{
	int i;
934
	struct string_list list = STRING_LIST_INIT_NODUP;
935 936 937
	struct remote *remote;
	int result = 0;

J
Jeff King 已提交
938 939
	packet_trace_identity("fetch");

940 941 942 943 944 945 946 947
	/* Record the command line for the reflog */
	strbuf_addstr(&default_rla, "fetch");
	for (i = 1; i < argc; i++)
		strbuf_addf(&default_rla, " %s", argv[i]);

	argc = parse_options(argc, argv, prefix,
			     builtin_fetch_options, builtin_fetch_usage, 0);

948 949 950 951 952 953 954 955 956
	if (recurse_submodules != RECURSE_SUBMODULES_OFF) {
		if (recurse_submodules_default) {
			int arg = parse_fetch_recurse_submodules_arg("--recurse-submodules-default", recurse_submodules_default);
			set_config_fetch_recurse_submodules(arg);
		}
		gitmodules_config();
		git_config(submodule_config, NULL);
	}

957 958
	if (all) {
		if (argc == 1)
959
			die(_("fetch --all does not take a repository argument"));
960
		else if (argc > 1)
961
			die(_("fetch --all does not make sense with refspecs"));
962 963 964 965 966 967
		(void) for_each_remote(get_one_remote_for_fetch, &list);
		result = fetch_multiple(&list);
	} else if (argc == 0) {
		/* No arguments -- use default remote */
		remote = remote_get(NULL);
		result = fetch_one(remote, argc, argv);
968 969 970 971
	} else if (multiple) {
		/* All arguments are assumed to be remotes or groups */
		for (i = 0; i < argc; i++)
			if (!add_remote_or_group(argv[i], &list))
972
				die(_("No such remote or remote group: %s"), argv[i]);
973
		result = fetch_multiple(&list);
974 975 976 977 978 979
	} else {
		/* Single remote or group */
		(void) add_remote_or_group(argv[0], &list);
		if (list.nr > 1) {
			/* More than one remote */
			if (argc > 1)
980
				die(_("Fetching a group and specifying refspecs does not make sense"));
981 982 983 984 985 986 987 988
			result = fetch_multiple(&list);
		} else {
			/* Zero or one remotes */
			remote = remote_get(argv[0]);
			result = fetch_one(remote, argc-1, argv+1);
		}
	}

989
	if (!result && (recurse_submodules != RECURSE_SUBMODULES_OFF)) {
990 991 992 993 994
		const char *options[10];
		int num_options = 0;
		add_options_to_argv(&num_options, options);
		result = fetch_populated_submodules(num_options, options,
						    submodule_prefix,
995
						    recurse_submodules,
996 997 998
						    verbosity < 0);
	}

999 1000 1001 1002 1003 1004
	/* All names were strdup()ed or strndup()ed */
	list.strdup_strings = 1;
	string_list_clear(&list, 0);

	return result;
}