builtin-clone.c 17.0 KB
Newer Older
D
Daniel Barkalow 已提交
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
/*
 * Builtin "git clone"
 *
 * Copyright (c) 2007 Kristian Høgsberg <krh@redhat.com>,
 *		 2008 Daniel Barkalow <barkalow@iabervon.org>
 * Based on git-commit.sh by Junio C Hamano and Linus Torvalds
 *
 * Clone a repository into a different directory that does not yet exist.
 */

#include "cache.h"
#include "parse-options.h"
#include "fetch-pack.h"
#include "refs.h"
#include "tree.h"
#include "tree-walk.h"
#include "unpack-trees.h"
#include "transport.h"
#include "strbuf.h"
#include "dir.h"
J
Johan Herland 已提交
21
#include "pack-refs.h"
22
#include "sigchain.h"
23
#include "branch.h"
J
Jay Soffian 已提交
24
#include "remote.h"
25
#include "run-command.h"
D
Daniel Barkalow 已提交
26 27 28 29 30 31 32 33 34 35

/*
 * Overall FIXMEs:
 *  - respect DB_ENVIRONMENT for .git/objects.
 *
 * Implementation notes:
 *  - dropping use-separate-remote and no-separate-remote compatibility
 *
 */
static const char * const builtin_clone_usage[] = {
S
Stephan Beyer 已提交
36
	"git clone [options] [--] <repo> [<dir>]",
D
Daniel Barkalow 已提交
37 38 39
	NULL
};

40
static int option_quiet, option_no_checkout, option_bare, option_mirror;
41
static int option_local, option_no_hardlinks, option_shared, option_recursive;
D
Daniel Barkalow 已提交
42 43
static char *option_template, *option_reference, *option_depth;
static char *option_origin = NULL;
44
static char *option_branch = NULL;
D
Daniel Barkalow 已提交
45
static char *option_upload_pack = "git-upload-pack";
M
Miklos Vajna 已提交
46
static int option_verbose;
D
Daniel Barkalow 已提交
47 48 49

static struct option builtin_clone_options[] = {
	OPT__QUIET(&option_quiet),
M
Miklos Vajna 已提交
50
	OPT__VERBOSE(&option_verbose),
D
Daniel Barkalow 已提交
51 52 53
	OPT_BOOLEAN('n', "no-checkout", &option_no_checkout,
		    "don't create a checkout"),
	OPT_BOOLEAN(0, "bare", &option_bare, "create a bare repository"),
J
Junio C Hamano 已提交
54 55 56
	{ OPTION_BOOLEAN, 0, "naked", &option_bare, NULL,
		"create a bare repository",
		PARSE_OPT_NOARG | PARSE_OPT_HIDDEN },
57 58
	OPT_BOOLEAN(0, "mirror", &option_mirror,
		    "create a mirror repository (implies bare)"),
D
Daniel Barkalow 已提交
59 60 61 62 63 64
	OPT_BOOLEAN('l', "local", &option_local,
		    "to clone from a local repository"),
	OPT_BOOLEAN(0, "no-hardlinks", &option_no_hardlinks,
		    "don't use local hardlinks, always copy"),
	OPT_BOOLEAN('s', "shared", &option_shared,
		    "setup as shared repository"),
65
	OPT_BOOLEAN(0, "recursive", &option_recursive,
J
Junio C Hamano 已提交
66
		    "initialize submodules in the clone"),
D
Daniel Barkalow 已提交
67 68 69 70 71
	OPT_STRING(0, "template", &option_template, "path",
		   "path the template repository"),
	OPT_STRING(0, "reference", &option_reference, "repo",
		   "reference repository"),
	OPT_STRING('o', "origin", &option_origin, "branch",
F
Fabrizio Chiarello 已提交
72
		   "use <branch> instead of 'origin' to track upstream"),
73 74
	OPT_STRING('b', "branch", &option_branch, "branch",
		   "checkout <branch> instead of the remote's HEAD"),
D
Daniel Barkalow 已提交
75 76 77 78 79 80 81 82
	OPT_STRING('u', "upload-pack", &option_upload_pack, "path",
		   "path to git-upload-pack on the remote"),
	OPT_STRING(0, "depth", &option_depth, "depth",
		    "create a shallow clone of that depth"),

	OPT_END()
};

83 84 85 86
static const char *argv_submodule[] = {
	"submodule", "update", "--init", "--recursive", NULL
};

D
Daniel Barkalow 已提交
87 88 89 90 91 92 93 94 95 96
static char *get_repo_path(const char *repo, int *is_bundle)
{
	static char *suffix[] = { "/.git", ".git", "" };
	static char *bundle_suffix[] = { ".bundle", "" };
	struct stat st;
	int i;

	for (i = 0; i < ARRAY_SIZE(suffix); i++) {
		const char *path;
		path = mkpath("%s%s", repo, suffix[i]);
97
		if (is_directory(path)) {
D
Daniel Barkalow 已提交
98
			*is_bundle = 0;
99
			return xstrdup(make_nonrelative_path(path));
D
Daniel Barkalow 已提交
100 101 102 103 104 105 106 107
		}
	}

	for (i = 0; i < ARRAY_SIZE(bundle_suffix); i++) {
		const char *path;
		path = mkpath("%s%s", repo, bundle_suffix[i]);
		if (!stat(path, &st) && S_ISREG(st.st_mode)) {
			*is_bundle = 1;
108
			return xstrdup(make_nonrelative_path(path));
D
Daniel Barkalow 已提交
109 110 111 112 113 114
		}
	}

	return NULL;
}

115
static char *guess_dir_name(const char *repo, int is_bundle, int is_bare)
D
Daniel Barkalow 已提交
116
{
117
	const char *end = repo + strlen(repo), *start;
118
	char *dir;
119 120

	/*
121
	 * Strip trailing spaces, slashes and /.git
122
	 */
123
	while (repo < end && (is_dir_sep(end[-1]) || isspace(end[-1])))
124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149
		end--;
	if (end - repo > 5 && is_dir_sep(end[-5]) &&
	    !strncmp(end - 4, ".git", 4)) {
		end -= 5;
		while (repo < end && is_dir_sep(end[-1]))
			end--;
	}

	/*
	 * Find last component, but be prepared that repo could have
	 * the form  "remote.example.com:foo.git", i.e. no slash
	 * in the directory part.
	 */
	start = end;
	while (repo < start && !is_dir_sep(start[-1]) && start[-1] != ':')
		start--;

	/*
	 * Strip .{bundle,git}.
	 */
	if (is_bundle) {
		if (end - start > 7 && !strncmp(end - 7, ".bundle", 7))
			end -= 7;
	} else {
		if (end - start > 4 && !strncmp(end - 4, ".git", 4))
			end -= 4;
D
Daniel Barkalow 已提交
150 151
	}

152
	if (is_bare) {
153 154
		struct strbuf result = STRBUF_INIT;
		strbuf_addf(&result, "%.*s.git", (int)(end - start), start);
155
		dir = strbuf_detach(&result, NULL);
156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179
	} else
		dir = xstrndup(start, end - start);
	/*
	 * Replace sequences of 'control' characters and whitespace
	 * with one ascii space, remove leading and trailing spaces.
	 */
	if (*dir) {
		char *out = dir;
		int prev_space = 1 /* strip leading whitespace */;
		for (end = dir; *end; ++end) {
			char ch = *end;
			if ((unsigned char)ch < '\x20')
				ch = '\x20';
			if (isspace(ch)) {
				if (prev_space)
					continue;
				prev_space = 1;
			} else
				prev_space = 0;
			*out++ = ch;
		}
		*out = '\0';
		if (out > dir && prev_space)
			out[-1] = '\0';
180
	}
181
	return dir;
D
Daniel Barkalow 已提交
182 183
}

184 185 186 187 188 189 190 191 192
static void strip_trailing_slashes(char *dir)
{
	char *end = dir + strlen(dir);

	while (dir < end - 1 && is_dir_sep(end[-1]))
		end--;
	*end = '\0';
}

D
Daniel Barkalow 已提交
193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224
static void setup_reference(const char *repo)
{
	const char *ref_git;
	char *ref_git_copy;

	struct remote *remote;
	struct transport *transport;
	const struct ref *extra;

	ref_git = make_absolute_path(option_reference);

	if (is_directory(mkpath("%s/.git/objects", ref_git)))
		ref_git = mkpath("%s/.git", ref_git);
	else if (!is_directory(mkpath("%s/objects", ref_git)))
		die("reference repository '%s' is not a local directory.",
		    option_reference);

	ref_git_copy = xstrdup(ref_git);

	add_to_alternates_file(ref_git_copy);

	remote = remote_get(ref_git_copy);
	transport = transport_get(remote, ref_git_copy);
	for (extra = transport_get_remote_refs(transport); extra;
	     extra = extra->next)
		add_extra_ref(extra->name, extra->old_sha1, 0);

	transport_disconnect(transport);

	free(ref_git_copy);
}

225
static void copy_or_link_directory(struct strbuf *src, struct strbuf *dest)
D
Daniel Barkalow 已提交
226 227 228 229 230 231
{
	struct dirent *de;
	struct stat buf;
	int src_len, dest_len;
	DIR *dir;

232
	dir = opendir(src->buf);
D
Daniel Barkalow 已提交
233
	if (!dir)
234
		die_errno("failed to open '%s'", src->buf);
D
Daniel Barkalow 已提交
235

236
	if (mkdir(dest->buf, 0777)) {
D
Daniel Barkalow 已提交
237
		if (errno != EEXIST)
238
			die_errno("failed to create directory '%s'", dest->buf);
239
		else if (stat(dest->buf, &buf))
240
			die_errno("failed to stat '%s'", dest->buf);
D
Daniel Barkalow 已提交
241
		else if (!S_ISDIR(buf.st_mode))
242
			die("%s exists and is not a directory", dest->buf);
D
Daniel Barkalow 已提交
243 244
	}

245 246 247 248
	strbuf_addch(src, '/');
	src_len = src->len;
	strbuf_addch(dest, '/');
	dest_len = dest->len;
D
Daniel Barkalow 已提交
249 250

	while ((de = readdir(dir)) != NULL) {
251 252 253 254 255 256
		strbuf_setlen(src, src_len);
		strbuf_addstr(src, de->d_name);
		strbuf_setlen(dest, dest_len);
		strbuf_addstr(dest, de->d_name);
		if (stat(src->buf, &buf)) {
			warning ("failed to stat %s\n", src->buf);
D
Daniel Barkalow 已提交
257 258 259 260 261 262 263 264
			continue;
		}
		if (S_ISDIR(buf.st_mode)) {
			if (de->d_name[0] != '.')
				copy_or_link_directory(src, dest);
			continue;
		}

265
		if (unlink(dest->buf) && errno != ENOENT)
266
			die_errno("failed to unlink '%s'", dest->buf);
267
		if (!option_no_hardlinks) {
268
			if (!link(src->buf, dest->buf))
269 270
				continue;
			if (option_local)
271
				die_errno("failed to create link '%s'", dest->buf);
272
			option_no_hardlinks = 1;
D
Daniel Barkalow 已提交
273
		}
274
		if (copy_file_with_time(dest->buf, src->buf, 0666))
275
			die_errno("failed to copy file to '%s'", dest->buf);
D
Daniel Barkalow 已提交
276
	}
277
	closedir(dir);
D
Daniel Barkalow 已提交
278 279 280 281 282 283
}

static const struct ref *clone_local(const char *src_repo,
				     const char *dest_repo)
{
	const struct ref *ret;
284 285
	struct strbuf src = STRBUF_INIT;
	struct strbuf dest = STRBUF_INIT;
D
Daniel Barkalow 已提交
286 287 288 289 290 291
	struct remote *remote;
	struct transport *transport;

	if (option_shared)
		add_to_alternates_file(src_repo);
	else {
292 293 294 295 296
		strbuf_addf(&src, "%s/objects", src_repo);
		strbuf_addf(&dest, "%s/objects", dest_repo);
		copy_or_link_directory(&src, &dest);
		strbuf_release(&src);
		strbuf_release(&dest);
D
Daniel Barkalow 已提交
297 298 299 300 301 302 303 304 305 306 307
	}

	remote = remote_get(src_repo);
	transport = transport_get(remote, src_repo);
	ret = transport_get_remote_refs(transport);
	transport_disconnect(transport);
	return ret;
}

static const char *junk_work_tree;
static const char *junk_git_dir;
308
static pid_t junk_pid;
D
Daniel Barkalow 已提交
309 310 311

static void remove_junk(void)
{
312
	struct strbuf sb = STRBUF_INIT;
D
Daniel Barkalow 已提交
313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329
	if (getpid() != junk_pid)
		return;
	if (junk_git_dir) {
		strbuf_addstr(&sb, junk_git_dir);
		remove_dir_recursively(&sb, 0);
		strbuf_reset(&sb);
	}
	if (junk_work_tree) {
		strbuf_addstr(&sb, junk_work_tree);
		remove_dir_recursively(&sb, 0);
		strbuf_reset(&sb);
	}
}

static void remove_junk_on_signal(int signo)
{
	remove_junk();
330
	sigchain_pop(signo);
D
Daniel Barkalow 已提交
331 332 333
	raise(signo);
}

334 335
static struct ref *wanted_peer_refs(const struct ref *refs,
		struct refspec *refspec)
D
Daniel Barkalow 已提交
336 337 338 339 340
{
	struct ref *local_refs = NULL;
	struct ref **tail = &local_refs;

	get_fetch_map(refs, refspec, &tail, 0);
341 342
	if (!option_mirror)
		get_fetch_map(refs, tag_refspec, &tail, 0);
D
Daniel Barkalow 已提交
343

344 345 346 347 348 349 350
	return local_refs;
}

static void write_remote_refs(const struct ref *local_refs)
{
	const struct ref *r;

D
Daniel Barkalow 已提交
351
	for (r = local_refs; r; r = r->next)
J
Johan Herland 已提交
352 353 354 355
		add_extra_ref(r->peer_ref->name, r->old_sha1, 0);

	pack_refs(PACK_REFS_ALL);
	clear_extra_refs();
D
Daniel Barkalow 已提交
356 357 358 359 360 361 362 363
}

int cmd_clone(int argc, const char **argv, const char *prefix)
{
	int is_bundle = 0;
	struct stat buf;
	const char *repo_name, *repo, *work_tree, *git_dir;
	char *path, *dir;
364
	int dest_exists;
365 366 367
	const struct ref *refs, *remote_head, *mapped_refs;
	const struct ref *remote_head_points_at;
	const struct ref *our_head_points_at;
368 369
	struct strbuf key = STRBUF_INIT, value = STRBUF_INIT;
	struct strbuf branch_top = STRBUF_INIT, reflog_msg = STRBUF_INIT;
370
	struct transport *transport = NULL;
371
	char *src_ref_prefix = "refs/heads/";
372
	int err = 0;
D
Daniel Barkalow 已提交
373

374 375
	struct refspec *refspec;
	const char *fetch_pattern;
D
Daniel Barkalow 已提交
376 377 378

	junk_pid = getpid();

379
	argc = parse_options(argc, argv, prefix, builtin_clone_options,
D
Daniel Barkalow 已提交
380 381
			     builtin_clone_usage, 0);

J
Jonathan Nieder 已提交
382 383 384 385
	if (argc > 2)
		usage_msg_opt("Too many arguments.",
			builtin_clone_usage, builtin_clone_options);

D
Daniel Barkalow 已提交
386
	if (argc == 0)
J
Jonathan Nieder 已提交
387 388
		usage_msg_opt("You must specify a repository to clone.",
			builtin_clone_usage, builtin_clone_options);
D
Daniel Barkalow 已提交
389

390 391 392
	if (option_mirror)
		option_bare = 1;

D
Daniel Barkalow 已提交
393 394 395 396 397 398 399 400 401 402 403 404 405 406
	if (option_bare) {
		if (option_origin)
			die("--bare and --origin %s options are incompatible.",
			    option_origin);
		option_no_checkout = 1;
	}

	if (!option_origin)
		option_origin = "origin";

	repo_name = argv[0];

	path = get_repo_path(repo_name, &is_bundle);
	if (path)
407
		repo = xstrdup(make_nonrelative_path(repo_name));
D
Daniel Barkalow 已提交
408 409 410 411 412 413 414 415
	else if (!strchr(repo_name, ':'))
		repo = xstrdup(make_absolute_path(repo_name));
	else
		repo = repo_name;

	if (argc == 2)
		dir = xstrdup(argv[1]);
	else
416
		dir = guess_dir_name(repo_name, is_bundle, option_bare);
417
	strip_trailing_slashes(dir);
D
Daniel Barkalow 已提交
418

419 420 421 422
	dest_exists = !stat(dir, &buf);
	if (dest_exists && !is_empty_dir(dir))
		die("destination path '%s' already exists and is not "
			"an empty directory.", dir);
D
Daniel Barkalow 已提交
423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442

	strbuf_addf(&reflog_msg, "clone: from %s", repo);

	if (option_bare)
		work_tree = NULL;
	else {
		work_tree = getenv("GIT_WORK_TREE");
		if (work_tree && !stat(work_tree, &buf))
			die("working tree '%s' already exists.", work_tree);
	}

	if (option_bare || work_tree)
		git_dir = xstrdup(dir);
	else {
		work_tree = dir;
		git_dir = xstrdup(mkpath("%s/.git", dir));
	}

	if (!option_bare) {
		junk_work_tree = work_tree;
443
		if (safe_create_leading_directories_const(work_tree) < 0)
444 445
			die_errno("could not create leading directories of '%s'",
				  work_tree);
446
		if (!dest_exists && mkdir(work_tree, 0755))
447 448
			die_errno("could not create work tree dir '%s'.",
				  work_tree);
D
Daniel Barkalow 已提交
449 450 451 452
		set_git_work_tree(work_tree);
	}
	junk_git_dir = git_dir;
	atexit(remove_junk);
453
	sigchain_push_common(remove_junk_on_signal);
D
Daniel Barkalow 已提交
454

455
	setenv(CONFIG_ENVIRONMENT, mkpath("%s/config", git_dir), 1);
D
Daniel Barkalow 已提交
456

457 458
	if (safe_create_leading_directories_const(git_dir) < 0)
		die("could not create leading directories of '%s'", git_dir);
D
Daniel Barkalow 已提交
459 460 461 462
	set_git_dir(make_absolute_path(git_dir));

	init_db(option_template, option_quiet ? INIT_DB_QUIET : 0);

463 464 465 466 467 468 469
	/*
	 * At this point, the config exists, so we do not need the
	 * environment variable.  We actually need to unset it, too, to
	 * re-enable parsing of the global configs.
	 */
	unsetenv(CONFIG_ENVIRONMENT);

D
Daniel Barkalow 已提交
470 471 472
	if (option_reference)
		setup_reference(git_dir);

J
Junio C Hamano 已提交
473
	git_config(git_default_config, NULL);
D
Daniel Barkalow 已提交
474 475

	if (option_bare) {
476 477
		if (option_mirror)
			src_ref_prefix = "refs/";
478
		strbuf_addstr(&branch_top, src_ref_prefix);
D
Daniel Barkalow 已提交
479 480 481

		git_config_set("core.bare", "true");
	} else {
482
		strbuf_addf(&branch_top, "refs/remotes/%s/", option_origin);
483
	}
D
Daniel Barkalow 已提交
484

485 486
	strbuf_addf(&value, "+%s*:%s*", src_ref_prefix, branch_top.buf);

487
	if (option_mirror || !option_bare) {
D
Daniel Barkalow 已提交
488
		/* Configure the remote */
489 490 491 492
		strbuf_addf(&key, "remote.%s.fetch", option_origin);
		git_config_set_multivar(key.buf, value.buf, "^$", 0);
		strbuf_reset(&key);

493
		if (option_mirror) {
494 495 496
			strbuf_addf(&key, "remote.%s.mirror", option_origin);
			git_config_set(key.buf, "true");
			strbuf_reset(&key);
497 498
		}

499 500 501
		strbuf_addf(&key, "remote.%s.url", option_origin);
		git_config_set(key.buf, repo);
		strbuf_reset(&key);
D
Daniel Barkalow 已提交
502 503
	}

504 505 506 507
	fetch_pattern = value.buf;
	refspec = parse_fetch_refspec(1, &fetch_pattern);

	strbuf_reset(&value);
D
Daniel Barkalow 已提交
508

509
	if (path && !is_bundle) {
D
Daniel Barkalow 已提交
510
		refs = clone_local(path, git_dir);
511 512
		mapped_refs = wanted_peer_refs(refs, refspec);
	} else {
D
Daniel Barkalow 已提交
513
		struct remote *remote = remote_get(argv[0]);
514
		transport = transport_get(remote, remote->url[0]);
D
Daniel Barkalow 已提交
515

516 517 518
		if (!transport->get_refs_list || !transport->fetch)
			die("Don't know how to clone %s", transport->url);

D
Daniel Barkalow 已提交
519 520 521 522 523 524 525 526
		transport_set_option(transport, TRANS_OPT_KEEP, "yes");

		if (option_depth)
			transport_set_option(transport, TRANS_OPT_DEPTH,
					     option_depth);

		if (option_quiet)
			transport->verbose = -1;
M
Miklos Vajna 已提交
527 528
		else if (option_verbose)
			transport->progress = 1;
D
Daniel Barkalow 已提交
529

530 531 532 533
		if (option_upload_pack)
			transport_set_option(transport, TRANS_OPT_UPLOADPACK,
					     option_upload_pack);

D
Daniel Barkalow 已提交
534
		refs = transport_get_remote_refs(transport);
535 536 537 538
		if (refs) {
			mapped_refs = wanted_peer_refs(refs, refspec);
			transport_fetch_refs(transport, mapped_refs);
		}
D
Daniel Barkalow 已提交
539 540
	}

541 542
	if (refs) {
		clear_extra_refs();
D
Daniel Barkalow 已提交
543

544
		write_remote_refs(mapped_refs);
D
Daniel Barkalow 已提交
545

546
		remote_head = find_ref_by_name(refs, "HEAD");
547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566
		remote_head_points_at =
			guess_remote_head(remote_head, mapped_refs, 0);

		if (option_branch) {
			struct strbuf head = STRBUF_INIT;
			strbuf_addstr(&head, src_ref_prefix);
			strbuf_addstr(&head, option_branch);
			our_head_points_at =
				find_ref_by_name(mapped_refs, head.buf);
			strbuf_release(&head);

			if (!our_head_points_at) {
				warning("Remote branch %s not found in "
					"upstream %s, using HEAD instead",
					option_branch, option_origin);
				our_head_points_at = remote_head_points_at;
			}
		}
		else
			our_head_points_at = remote_head_points_at;
567 568 569
	}
	else {
		warning("You appear to have cloned an empty repository.");
570 571
		our_head_points_at = NULL;
		remote_head_points_at = NULL;
572 573
		remote_head = NULL;
		option_no_checkout = 1;
574
		if (!option_bare)
575
			install_branch_config(0, "master", option_origin,
576
					      "refs/heads/master");
577
	}
D
Daniel Barkalow 已提交
578

579 580 581 582 583 584 585 586
	if (remote_head_points_at && !option_bare) {
		struct strbuf head_ref = STRBUF_INIT;
		strbuf_addstr(&head_ref, branch_top.buf);
		strbuf_addstr(&head_ref, "HEAD");
		create_symref(head_ref.buf,
			      remote_head_points_at->peer_ref->name,
			      reflog_msg.buf);
	}
D
Daniel Barkalow 已提交
587

588 589 590
	if (our_head_points_at) {
		/* Local default branch link */
		create_symref("HEAD", our_head_points_at->name, NULL);
D
Daniel Barkalow 已提交
591
		if (!option_bare) {
592 593
			const char *head = skip_prefix(our_head_points_at->name,
						       "refs/heads/");
D
Daniel Barkalow 已提交
594
			update_ref(reflog_msg.buf, "HEAD",
595
				   our_head_points_at->old_sha1,
D
Daniel Barkalow 已提交
596
				   NULL, 0, DIE_ON_ERR);
597
			install_branch_config(0, head, option_origin,
598
					      our_head_points_at->name);
D
Daniel Barkalow 已提交
599 600 601
		}
	} else if (remote_head) {
		/* Source had detached HEAD pointing somewhere. */
602
		if (!option_bare) {
D
Daniel Barkalow 已提交
603 604 605
			update_ref(reflog_msg.buf, "HEAD",
				   remote_head->old_sha1,
				   NULL, REF_NODEREF, DIE_ON_ERR);
606 607
			our_head_points_at = remote_head;
		}
D
Daniel Barkalow 已提交
608 609 610 611 612 613 614 615
	} else {
		/* Nothing to checkout out */
		if (!option_no_checkout)
			warning("remote HEAD refers to nonexistent ref, "
				"unable to checkout.\n");
		option_no_checkout = 1;
	}

616
	if (transport) {
617
		transport_unlock_pack(transport);
618 619
		transport_disconnect(transport);
	}
620

D
Daniel Barkalow 已提交
621 622 623 624 625 626 627 628 629 630 631 632 633 634
	if (!option_no_checkout) {
		struct lock_file *lock_file = xcalloc(1, sizeof(struct lock_file));
		struct unpack_trees_options opts;
		struct tree *tree;
		struct tree_desc t;
		int fd;

		/* We need to be in the new work tree for the checkout */
		setup_work_tree();

		fd = hold_locked_index(lock_file, 1);

		memset(&opts, 0, sizeof opts);
		opts.update = 1;
635 636
		opts.merge = 1;
		opts.fn = oneway_merge;
D
Daniel Barkalow 已提交
637
		opts.verbose_update = !option_quiet;
638
		opts.src_index = &the_index;
D
Daniel Barkalow 已提交
639 640
		opts.dst_index = &the_index;

641
		tree = parse_tree_indirect(our_head_points_at->old_sha1);
D
Daniel Barkalow 已提交
642 643 644 645 646 647 648
		parse_tree(tree);
		init_tree_desc(&t, tree->buffer, tree->size);
		unpack_trees(1, &t, &opts);

		if (write_cache(fd, active_cache, active_nr) ||
		    commit_locked_index(lock_file))
			die("unable to write new index file");
649 650

		err |= run_hook(NULL, "post-checkout", sha1_to_hex(null_sha1),
651 652
				sha1_to_hex(our_head_points_at->old_sha1), "1",
				NULL);
653 654 655

		if (!err && option_recursive)
			err = run_command_v_opt(argv_submodule, RUN_GIT_CMD);
D
Daniel Barkalow 已提交
656 657 658
	}

	strbuf_release(&reflog_msg);
659 660 661
	strbuf_release(&branch_top);
	strbuf_release(&key);
	strbuf_release(&value);
D
Daniel Barkalow 已提交
662
	junk_pid = 0;
663
	return err;
D
Daniel Barkalow 已提交
664
}