clone.c 17.5 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_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";
46
static int option_verbosity;
47
static int option_progress;
D
Daniel Barkalow 已提交
48 49

static struct option builtin_clone_options[] = {
50
	OPT__VERBOSITY(&option_verbosity),
51 52
	OPT_BOOLEAN(0, "progress", &option_progress,
			"force progress reporting"),
D
Daniel Barkalow 已提交
53 54 55
	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 已提交
56 57 58
	{ OPTION_BOOLEAN, 0, "naked", &option_bare, NULL,
		"create a bare repository",
		PARSE_OPT_NOARG | PARSE_OPT_HIDDEN },
59 60
	OPT_BOOLEAN(0, "mirror", &option_mirror,
		    "create a mirror repository (implies bare)"),
D
Daniel Barkalow 已提交
61 62 63 64 65 66
	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"),
67
	OPT_BOOLEAN(0, "recursive", &option_recursive,
J
Junio C Hamano 已提交
68
		    "initialize submodules in the clone"),
69
	OPT_BOOLEAN(0, "recurse-submodules", &option_recursive,
70
		    "initialize submodules in the clone"),
71 72
	OPT_STRING(0, "template", &option_template, "template-directory",
		   "directory from which templates will be used"),
D
Daniel Barkalow 已提交
73 74 75
	OPT_STRING(0, "reference", &option_reference, "repo",
		   "reference repository"),
	OPT_STRING('o', "origin", &option_origin, "branch",
F
Fabrizio Chiarello 已提交
76
		   "use <branch> instead of 'origin' to track upstream"),
77 78
	OPT_STRING('b', "branch", &option_branch, "branch",
		   "checkout <branch> instead of the remote's HEAD"),
D
Daniel Barkalow 已提交
79 80 81 82 83 84 85 86
	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()
};

87 88 89 90
static const char *argv_submodule[] = {
	"submodule", "update", "--init", "--recursive", NULL
};

D
Daniel Barkalow 已提交
91 92 93 94 95 96 97 98 99 100
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]);
101
		if (is_directory(path)) {
D
Daniel Barkalow 已提交
102
			*is_bundle = 0;
103
			return xstrdup(absolute_path(path));
D
Daniel Barkalow 已提交
104 105 106 107 108 109 110 111
		}
	}

	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;
112
			return xstrdup(absolute_path(path));
D
Daniel Barkalow 已提交
113 114 115 116 117 118
		}
	}

	return NULL;
}

119
static char *guess_dir_name(const char *repo, int is_bundle, int is_bare)
D
Daniel Barkalow 已提交
120
{
121
	const char *end = repo + strlen(repo), *start;
122
	char *dir;
123 124

	/*
125
	 * Strip trailing spaces, slashes and /.git
126
	 */
127
	while (repo < end && (is_dir_sep(end[-1]) || isspace(end[-1])))
128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153
		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 已提交
154 155
	}

156
	if (is_bare) {
157 158
		struct strbuf result = STRBUF_INIT;
		strbuf_addf(&result, "%.*s.git", (int)(end - start), start);
159
		dir = strbuf_detach(&result, NULL);
160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183
	} 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';
184
	}
185
	return dir;
D
Daniel Barkalow 已提交
186 187
}

188 189 190 191 192 193 194 195 196
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 已提交
197 198 199 200 201 202 203 204 205
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;

206
	ref_git = real_path(option_reference);
D
Daniel Barkalow 已提交
207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228

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

229
static void copy_or_link_directory(struct strbuf *src, struct strbuf *dest)
D
Daniel Barkalow 已提交
230 231 232 233 234 235
{
	struct dirent *de;
	struct stat buf;
	int src_len, dest_len;
	DIR *dir;

236
	dir = opendir(src->buf);
D
Daniel Barkalow 已提交
237
	if (!dir)
238
		die_errno("failed to open '%s'", src->buf);
D
Daniel Barkalow 已提交
239

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

249 250 251 252
	strbuf_addch(src, '/');
	src_len = src->len;
	strbuf_addch(dest, '/');
	dest_len = dest->len;
D
Daniel Barkalow 已提交
253 254

	while ((de = readdir(dir)) != NULL) {
255 256 257 258 259 260
		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 已提交
261 262 263 264 265 266 267 268
			continue;
		}
		if (S_ISDIR(buf.st_mode)) {
			if (de->d_name[0] != '.')
				copy_or_link_directory(src, dest);
			continue;
		}

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

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

	if (option_shared)
		add_to_alternates_file(src_repo);
	else {
296 297 298 299 300
		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 已提交
301 302 303 304 305 306
	}

	remote = remote_get(src_repo);
	transport = transport_get(remote, src_repo);
	ret = transport_get_remote_refs(transport);
	transport_disconnect(transport);
307 308
	if (0 <= option_verbosity)
		printf("done.\n");
D
Daniel Barkalow 已提交
309 310 311 312 313
	return ret;
}

static const char *junk_work_tree;
static const char *junk_git_dir;
314
static pid_t junk_pid;
D
Daniel Barkalow 已提交
315 316 317

static void remove_junk(void)
{
318
	struct strbuf sb = STRBUF_INIT;
D
Daniel Barkalow 已提交
319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335
	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();
336
	sigchain_pop(signo);
D
Daniel Barkalow 已提交
337 338 339
	raise(signo);
}

340 341
static struct ref *wanted_peer_refs(const struct ref *refs,
		struct refspec *refspec)
D
Daniel Barkalow 已提交
342 343 344 345 346
{
	struct ref *local_refs = NULL;
	struct ref **tail = &local_refs;

	get_fetch_map(refs, refspec, &tail, 0);
347 348
	if (!option_mirror)
		get_fetch_map(refs, tag_refspec, &tail, 0);
D
Daniel Barkalow 已提交
349

350 351 352 353 354 355 356
	return local_refs;
}

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

D
Daniel Barkalow 已提交
357
	for (r = local_refs; r; r = r->next)
J
Johan Herland 已提交
358 359 360 361
		add_extra_ref(r->peer_ref->name, r->old_sha1, 0);

	pack_refs(PACK_REFS_ALL);
	clear_extra_refs();
D
Daniel Barkalow 已提交
362 363 364 365
}

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

381 382
	struct refspec *refspec;
	const char *fetch_pattern;
D
Daniel Barkalow 已提交
383 384 385

	junk_pid = getpid();

J
Jeff King 已提交
386
	packet_trace_identity("clone");
387
	argc = parse_options(argc, argv, prefix, builtin_clone_options,
D
Daniel Barkalow 已提交
388 389
			     builtin_clone_usage, 0);

J
Jonathan Nieder 已提交
390 391 392 393
	if (argc > 2)
		usage_msg_opt("Too many arguments.",
			builtin_clone_usage, builtin_clone_options);

D
Daniel Barkalow 已提交
394
	if (argc == 0)
J
Jonathan Nieder 已提交
395 396
		usage_msg_opt("You must specify a repository to clone.",
			builtin_clone_usage, builtin_clone_options);
D
Daniel Barkalow 已提交
397

398 399 400
	if (option_mirror)
		option_bare = 1;

D
Daniel Barkalow 已提交
401 402 403 404 405 406 407 408 409 410 411 412 413 414
	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)
415
		repo = xstrdup(absolute_path(repo_name));
D
Daniel Barkalow 已提交
416
	else if (!strchr(repo_name, ':'))
417
		die("repository '%s' does not exist", repo_name);
D
Daniel Barkalow 已提交
418 419
	else
		repo = repo_name;
420 421 422
	is_local = path && !is_bundle;
	if (is_local && option_depth)
		warning("--depth is ignored in local clones; use file:// instead.");
D
Daniel Barkalow 已提交
423 424 425 426

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

430 431 432 433
	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 已提交
434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453

	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;
454
		if (safe_create_leading_directories_const(work_tree) < 0)
455 456
			die_errno("could not create leading directories of '%s'",
				  work_tree);
457
		if (!dest_exists && mkdir(work_tree, 0755))
458 459
			die_errno("could not create work tree dir '%s'.",
				  work_tree);
D
Daniel Barkalow 已提交
460 461 462 463
		set_git_work_tree(work_tree);
	}
	junk_git_dir = git_dir;
	atexit(remove_junk);
464
	sigchain_push_common(remove_junk_on_signal);
D
Daniel Barkalow 已提交
465

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

468 469
	if (safe_create_leading_directories_const(git_dir) < 0)
		die("could not create leading directories of '%s'", git_dir);
470
	set_git_dir(real_path(git_dir));
D
Daniel Barkalow 已提交
471

472
	if (0 <= option_verbosity)
473 474
		printf("Cloning into %s%s...\n",
		       option_bare ? "bare repository " : "", dir);
475
	init_db(option_template, INIT_DB_QUIET);
D
Daniel Barkalow 已提交
476

477 478 479 480 481 482 483
	/*
	 * 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);

J
Junio C Hamano 已提交
484
	git_config(git_default_config, NULL);
D
Daniel Barkalow 已提交
485 486

	if (option_bare) {
487 488
		if (option_mirror)
			src_ref_prefix = "refs/";
489
		strbuf_addstr(&branch_top, src_ref_prefix);
D
Daniel Barkalow 已提交
490 491 492

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

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

498
	if (option_mirror || !option_bare) {
D
Daniel Barkalow 已提交
499
		/* Configure the remote */
500 501 502 503
		strbuf_addf(&key, "remote.%s.fetch", option_origin);
		git_config_set_multivar(key.buf, value.buf, "^$", 0);
		strbuf_reset(&key);

504
		if (option_mirror) {
505 506 507
			strbuf_addf(&key, "remote.%s.mirror", option_origin);
			git_config_set(key.buf, "true");
			strbuf_reset(&key);
508
		}
D
Daniel Barkalow 已提交
509 510
	}

511 512 513 514
	strbuf_addf(&key, "remote.%s.url", option_origin);
	git_config_set(key.buf, repo);
	strbuf_reset(&key);

515 516 517
	if (option_reference)
		setup_reference(git_dir);

518 519 520 521
	fetch_pattern = value.buf;
	refspec = parse_fetch_refspec(1, &fetch_pattern);

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

523
	if (is_local) {
D
Daniel Barkalow 已提交
524
		refs = clone_local(path, git_dir);
525 526
		mapped_refs = wanted_peer_refs(refs, refspec);
	} else {
527
		struct remote *remote = remote_get(option_origin);
528
		transport = transport_get(remote, remote->url[0]);
D
Daniel Barkalow 已提交
529

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

D
Daniel Barkalow 已提交
533 534 535 536 537 538
		transport_set_option(transport, TRANS_OPT_KEEP, "yes");

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

539
		transport_set_verbosity(transport, option_verbosity, option_progress);
D
Daniel Barkalow 已提交
540

541 542 543 544
		if (option_upload_pack)
			transport_set_option(transport, TRANS_OPT_UPLOADPACK,
					     option_upload_pack);

D
Daniel Barkalow 已提交
545
		refs = transport_get_remote_refs(transport);
546 547 548 549
		if (refs) {
			mapped_refs = wanted_peer_refs(refs, refspec);
			transport_fetch_refs(transport, mapped_refs);
		}
D
Daniel Barkalow 已提交
550 551
	}

552 553
	if (refs) {
		clear_extra_refs();
D
Daniel Barkalow 已提交
554

555
		write_remote_refs(mapped_refs);
D
Daniel Barkalow 已提交
556

557
		remote_head = find_ref_by_name(refs, "HEAD");
558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577
		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;
578 579 580
	}
	else {
		warning("You appear to have cloned an empty repository.");
581 582
		our_head_points_at = NULL;
		remote_head_points_at = NULL;
583 584
		remote_head = NULL;
		option_no_checkout = 1;
585
		if (!option_bare)
586
			install_branch_config(0, "master", option_origin,
587
					      "refs/heads/master");
588
	}
D
Daniel Barkalow 已提交
589

590 591 592 593 594 595 596 597
	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 已提交
598

599 600 601
	if (our_head_points_at) {
		/* Local default branch link */
		create_symref("HEAD", our_head_points_at->name, NULL);
D
Daniel Barkalow 已提交
602
		if (!option_bare) {
603 604
			const char *head = skip_prefix(our_head_points_at->name,
						       "refs/heads/");
D
Daniel Barkalow 已提交
605
			update_ref(reflog_msg.buf, "HEAD",
606
				   our_head_points_at->old_sha1,
D
Daniel Barkalow 已提交
607
				   NULL, 0, DIE_ON_ERR);
608
			install_branch_config(0, head, option_origin,
609
					      our_head_points_at->name);
D
Daniel Barkalow 已提交
610 611 612
		}
	} else if (remote_head) {
		/* Source had detached HEAD pointing somewhere. */
613
		if (!option_bare) {
D
Daniel Barkalow 已提交
614 615 616
			update_ref(reflog_msg.buf, "HEAD",
				   remote_head->old_sha1,
				   NULL, REF_NODEREF, DIE_ON_ERR);
617 618
			our_head_points_at = remote_head;
		}
D
Daniel Barkalow 已提交
619 620 621 622 623 624 625 626
	} else {
		/* Nothing to checkout out */
		if (!option_no_checkout)
			warning("remote HEAD refers to nonexistent ref, "
				"unable to checkout.\n");
		option_no_checkout = 1;
	}

627
	if (transport) {
628
		transport_unlock_pack(transport);
629 630
		transport_disconnect(transport);
	}
631

D
Daniel Barkalow 已提交
632 633 634 635 636 637 638 639 640 641 642 643 644 645
	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;
646 647
		opts.merge = 1;
		opts.fn = oneway_merge;
648
		opts.verbose_update = (option_verbosity > 0);
649
		opts.src_index = &the_index;
D
Daniel Barkalow 已提交
650 651
		opts.dst_index = &the_index;

652
		tree = parse_tree_indirect(our_head_points_at->old_sha1);
D
Daniel Barkalow 已提交
653 654 655 656 657 658 659
		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");
660 661

		err |= run_hook(NULL, "post-checkout", sha1_to_hex(null_sha1),
662 663
				sha1_to_hex(our_head_points_at->old_sha1), "1",
				NULL);
664 665 666

		if (!err && option_recursive)
			err = run_command_v_opt(argv_submodule, RUN_GIT_CMD);
D
Daniel Barkalow 已提交
667 668 669
	}

	strbuf_release(&reflog_msg);
670 671 672
	strbuf_release(&branch_top);
	strbuf_release(&key);
	strbuf_release(&value);
D
Daniel Barkalow 已提交
673
	junk_pid = 0;
674
	return err;
D
Daniel Barkalow 已提交
675
}