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"
D
Daniel Barkalow 已提交
16

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

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

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

41 42 43 44 45 46 47 48 49 50 51 52 53
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;
}
54

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

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

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

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

111 112 113 114 115 116
	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 已提交
117
				rm->merge = 1;
118 119
				break;
			}
D
Daniel Barkalow 已提交
120
		}
121 122 123
		if (rm)
			continue;

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

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

D
Daniel Barkalow 已提交
146 147 148 149 150 151 152 153 154
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;

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

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

	return ref_map;
}

211 212 213
#define STORE_REF_ERROR_OTHER 1
#define STORE_REF_ERROR_DF_CONFLICT 2

D
Daniel Barkalow 已提交
214 215 216 217 218 219 220 221
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 已提交
222 223
	if (dry_run)
		return 0;
D
Daniel Barkalow 已提交
224
	if (!rla)
225
		rla = default_rla.buf;
D
Daniel Barkalow 已提交
226 227 228 229
	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)
230 231
		return errno == ENOTDIR ? STORE_REF_ERROR_DF_CONFLICT :
					  STORE_REF_ERROR_OTHER;
D
Daniel Barkalow 已提交
232
	if (write_ref_sha1(lock, ref->new_sha1, msg) < 0)
233 234
		return errno == ENOTDIR ? STORE_REF_ERROR_DF_CONFLICT :
					  STORE_REF_ERROR_OTHER;
D
Daniel Barkalow 已提交
235 236 237
	return 0;
}

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

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

N
Nicolas Pitre 已提交
249
	*display = 0;
D
Daniel Barkalow 已提交
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
			sprintf(display, "= %-*s %-*s -> %s", TRANSPORT_SUMMARY_WIDTH,
257
				_("[up to date]"), REFCOL_WIDTH, remote,
P
Pierre Habouzit 已提交
258
				pretty_ref);
D
Daniel Barkalow 已提交
259 260 261
		return 0;
	}

262 263
	if (current_branch &&
	    !strcmp(ref->name, current_branch->name) &&
D
Daniel Barkalow 已提交
264 265 266 267 268 269
	    !(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...
		 */
270 271
		sprintf(display, _("! %-*s %-*s -> %s  (can't fetch in current branch)"),
			TRANSPORT_SUMMARY_WIDTH, _("[rejected]"), REFCOL_WIDTH, remote,
P
Pierre Habouzit 已提交
272
			pretty_ref);
D
Daniel Barkalow 已提交
273 274 275 276 277
		return 1;
	}

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

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

304 305
		r = s_update_ref(msg, ref, 0);
		sprintf(display, "%c %-*s %-*s -> %s%s", r ? '!' : '*',
306
			TRANSPORT_SUMMARY_WIDTH, what, REFCOL_WIDTH, remote, pretty_ref,
307
			r ? _("  (unable to update local ref)") : "");
308
		return r;
D
Daniel Barkalow 已提交
309 310 311
	}

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

348
static int store_updated_refs(const char *raw_url, const char *remote_name,
349
		struct ref *ref_map)
D
Daniel Barkalow 已提交
350 351 352
{
	FILE *fp;
	struct commit *commit;
353
	int url_len, i, note_len, shown_url = 0, rc = 0;
D
Daniel Barkalow 已提交
354 355 356
	char note[1024];
	const char *what, *kind;
	struct ref *rm;
J
Jay Soffian 已提交
357
	char *url, *filename = dry_run ? "/dev/null" : git_path("FETCH_HEAD");
D
Daniel Barkalow 已提交
358

359 360
	fp = fopen(filename, "a");
	if (!fp)
361
		return error(_("cannot open %s: %s\n"), filename, strerror(errno));
362

363 364 365 366
	if (raw_url)
		url = transport_anonymize_url(raw_url);
	else
		url = xstrdup("foreign");
D
Daniel Barkalow 已提交
367 368 369 370 371 372 373 374
	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);
375
			ref->force = rm->peer_ref->force;
D
Daniel Barkalow 已提交
376 377
		}

378
		commit = lookup_commit_reference_gently(rm->old_sha1, 1);
D
Daniel Barkalow 已提交
379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394
		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/")) {
395
			kind = "remote-tracking branch";
D
Daniel Barkalow 已提交
396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416
			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;

		note_len = 0;
		if (*what) {
			if (*kind)
				note_len += sprintf(note + note_len, "%s ",
						    kind);
			note_len += sprintf(note + note_len, "'%s' of ", what);
		}
417 418
		note[note_len] = '\0';
		fprintf(fp, "%s\t%s\t%s",
D
Daniel Barkalow 已提交
419 420 421 422
			sha1_to_hex(commit ? commit->object.sha1 :
				    rm->old_sha1),
			rm->merge ? "" : "not-for-merge",
			note);
423 424 425 426 427 428
		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 已提交
429

430
		if (ref) {
T
Tuncer Ayaz 已提交
431
			rc |= update_local_ref(ref, what, note);
432 433
			free(ref);
		} else
434
			sprintf(note, "* %-*s %-*s -> FETCH_HEAD",
435
				TRANSPORT_SUMMARY_WIDTH, *kind ? kind : "branch",
436 437
				 REFCOL_WIDTH, *what ? what : "HEAD");
		if (*note) {
T
Tuncer Ayaz 已提交
438
			if (verbosity >= 0 && !shown_url) {
439
				fprintf(stderr, _("From %.*s\n"),
440 441
						url_len, url);
				shown_url = 1;
N
Nicolas Pitre 已提交
442
			}
T
Tuncer Ayaz 已提交
443 444
			if (verbosity >= 0)
				fprintf(stderr, " %s\n", note);
N
Nicolas Pitre 已提交
445
		}
D
Daniel Barkalow 已提交
446
	}
447
	free(url);
D
Daniel Barkalow 已提交
448
	fclose(fp);
449
	if (rc & STORE_REF_ERROR_DF_CONFLICT)
450
		error(_("some local refs could not be updated; try running\n"
451
		      " 'git remote prune %s' to remove any old, conflicting "
452
		      "branches"), remote_name);
453
	return rc;
D
Daniel Barkalow 已提交
454 455
}

456 457
/*
 * We would want to bypass the object transfer altogether if
458
 * everything we are going to fetch already exists and is connected
459 460
 * locally.
 *
461
 * The refs we are going to fetch are in ref_map.  If running
462
 *
463
 *  $ git rev-list --objects --stdin --not --all
464
 *
465
 * (feeding all the refs in ref_map on its standard input)
466 467 468 469 470 471 472 473
 * does not error out, that means everything reachable from the
 * refs we are going to fetch exists and is connected to some of
 * our existing refs.
 */
static int quickfetch(struct ref *ref_map)
{
	struct child_process revlist;
	struct ref *ref;
474 475 476
	int err;
	const char *argv[] = {"rev-list",
		"--quiet", "--objects", "--stdin", "--not", "--all", NULL};
477 478 479 480 481 482 483 484 485 486 487

	/*
	 * 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;

488
	if (!ref_map)
489 490 491
		return 0;

	memset(&revlist, 0, sizeof(revlist));
492
	revlist.argv = argv;
493 494 495
	revlist.git_cmd = 1;
	revlist.no_stdout = 1;
	revlist.no_stderr = 1;
496 497 498 499
	revlist.in = -1;

	err = start_command(&revlist);
	if (err) {
500
		error(_("could not run rev-list"));
501 502 503 504 505 506 507 508 509 510 511
		return err;
	}

	/*
	 * If rev-list --stdin encounters an unknown commit, it terminates,
	 * which will cause SIGPIPE in the write loop below.
	 */
	sigchain_push(SIGPIPE, SIG_IGN);

	for (ref = ref_map; ref; ref = ref->next) {
		if (write_in_full(revlist.in, sha1_to_hex(ref->old_sha1), 40) < 0 ||
512
		    write_str_in_full(revlist.in, "\n") < 0) {
513
			if (errno != EPIPE && errno != EINVAL)
514
				error(_("failed write to rev-list: %s"), strerror(errno));
515 516 517 518 519 520
			err = -1;
			break;
		}
	}

	if (close(revlist.in)) {
521
		error(_("failed to close rev-list's stdin: %s"), strerror(errno));
522 523 524 525
		err = -1;
	}

	sigchain_pop(SIGPIPE);
526

527
	return finish_command(&revlist) || err;
528 529
}

D
Daniel Barkalow 已提交
530 531
static int fetch_refs(struct transport *transport, struct ref *ref_map)
{
532 533 534
	int ret = quickfetch(ref_map);
	if (ret)
		ret = transport_fetch_refs(transport, ref_map);
D
Daniel Barkalow 已提交
535
	if (!ret)
536 537 538
		ret |= store_updated_refs(transport->url,
				transport->remote->name,
				ref_map);
539
	transport_unlock_pack(transport);
D
Daniel Barkalow 已提交
540 541 542
	return ret;
}

543
static int prune_refs(struct refspec *refs, int ref_count, struct ref *ref_map)
J
Jay Soffian 已提交
544 545
{
	int result = 0;
546
	struct ref *ref, *stale_refs = get_stale_heads(refs, ref_count, ref_map);
J
Jay Soffian 已提交
547
	const char *dangling_msg = dry_run
548 549
		? _("   (%s will become dangling)\n")
		: _("   (%s has become dangling)\n");
J
Jay Soffian 已提交
550 551 552 553 554 555

	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",
556 557
				TRANSPORT_SUMMARY_WIDTH, _("[deleted]"),
				REFCOL_WIDTH, _("(none)"), prettify_refname(ref->name));
J
Jay Soffian 已提交
558 559 560 561 562 563 564
			warn_dangling_symref(stderr, dangling_msg, ref->name);
		}
	}
	free_refs(stale_refs);
	return result;
}

D
Daniel Barkalow 已提交
565 566 567
static int add_existing(const char *refname, const unsigned char *sha1,
			int flag, void *cbdata)
{
568
	struct string_list *list = (struct string_list *)cbdata;
569
	struct string_list_item *item = string_list_insert(list, refname);
570
	item->util = (void *)sha1;
D
Daniel Barkalow 已提交
571 572 573
	return 0;
}

574 575 576 577 578 579 580 581 582 583 584
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;
}

585 586 587
static void find_non_local_tags(struct transport *transport,
			struct ref **head,
			struct ref ***tail)
D
Daniel Barkalow 已提交
588
{
589 590
	struct string_list existing_refs = STRING_LIST_INIT_NODUP;
	struct string_list remote_refs = STRING_LIST_INIT_NODUP;
591
	const struct ref *ref;
592
	struct string_list_item *item = NULL;
D
Daniel Barkalow 已提交
593 594 595 596 597 598

	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;

599 600 601 602 603 604
		/*
		 * 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.
		 */
605
		if (!suffixcmp(ref->name, "^{}")) {
606 607 608 609 610 611 612
			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 已提交
613 614
		}

615 616 617 618 619 620 621 622 623
		/*
		 * 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 已提交
624

625
		item = NULL;
D
Daniel Barkalow 已提交
626

627 628 629 630 631
		/* 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;

632
		item = string_list_insert(&remote_refs, ref->name);
633
		item->util = (void *)ref->old_sha1;
D
Daniel Barkalow 已提交
634
	}
635
	string_list_clear(&existing_refs, 0);
636 637 638 639 640 641 642 643 644 645

	/*
	 * 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;

	/*
646 647
	 * For all the tags in the remote_refs string list,
	 * add them to the list of refs to be fetched
648
	 */
649 650 651 652 653 654 655 656 657 658 659
	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;
		}
	}
660 661

	string_list_clear(&remote_refs, 0);
D
Daniel Barkalow 已提交
662 663
}

664 665 666 667 668 669 670 671 672 673
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))
674 675
			die(_("Refusing to fetch into current branch %s "
			    "of non-bare repository"), current_branch->refname);
676 677
}

678 679 680 681 682 683
static int truncate_fetch_head(void)
{
	char *filename = git_path("FETCH_HEAD");
	FILE *fp = fopen(filename, "w");

	if (!fp)
684
		return error(_("cannot open %s: %s\n"), filename, strerror(errno));
685 686 687 688
	fclose(fp);
	return 0;
}

D
Daniel Barkalow 已提交
689 690 691
static int do_fetch(struct transport *transport,
		    struct refspec *refs, int ref_count)
{
692
	struct string_list existing_refs = STRING_LIST_INIT_NODUP;
693
	struct string_list_item *peer_item = NULL;
694
	struct ref *ref_map;
D
Daniel Barkalow 已提交
695 696
	struct ref *rm;
	int autotags = (transport->remote->fetch_tags == 1);
697 698 699

	for_each_ref(add_existing, &existing_refs);

700 701 702 703 704 705
	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 已提交
706

707
	if (!transport->get_refs_list || !transport->fetch)
708
		die(_("Don't know how to fetch from %s"), transport->url);
D
Daniel Barkalow 已提交
709 710

	/* if not appending, truncate FETCH_HEAD */
J
Jay Soffian 已提交
711
	if (!append && !dry_run) {
712 713 714
		int errcode = truncate_fetch_head();
		if (errcode)
			return errcode;
715
	}
D
Daniel Barkalow 已提交
716 717

	ref_map = get_ref_map(transport, refs, ref_count, tags, &autotags);
718 719
	if (!update_head_ok)
		check_not_current_branch(ref_map);
D
Daniel Barkalow 已提交
720 721

	for (rm = ref_map; rm; rm = rm->next) {
722
		if (rm->peer_ref) {
723 724
			peer_item = string_list_lookup(&existing_refs,
						       rm->peer_ref->name);
725 726 727 728
			if (peer_item)
				hashcpy(rm->peer_ref->old_sha1,
					peer_item->util);
		}
D
Daniel Barkalow 已提交
729 730
	}

731 732
	if (tags == TAGS_DEFAULT && autotags)
		transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, "1");
D
Daniel Barkalow 已提交
733 734 735 736
	if (fetch_refs(transport, ref_map)) {
		free_refs(ref_map);
		return 1;
	}
737 738 739 740 741 742
	if (prune) {
		if (ref_count)
			prune_refs(refs, ref_count, ref_map);
		else
			prune_refs(transport->remote->fetch, transport->remote->fetch_refspec_nr, ref_map);
	}
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;
}