builtin-clone.c 16.2 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"
D
Daniel Barkalow 已提交
23 24 25 26 27 28 29 30 31 32

/*
 * 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 已提交
33
	"git clone [options] [--] <repo> [<dir>]",
D
Daniel Barkalow 已提交
34 35 36
	NULL
};

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

static struct option builtin_clone_options[] = {
	OPT__QUIET(&option_quiet),
M
Miklos Vajna 已提交
46
	OPT__VERBOSE(&option_verbose),
D
Daniel Barkalow 已提交
47 48 49 50
	OPT_BOOLEAN('n', "no-checkout", &option_no_checkout,
		    "don't create a checkout"),
	OPT_BOOLEAN(0, "bare", &option_bare, "create a bare repository"),
	OPT_BOOLEAN(0, "naked", &option_bare, "create a bare repository"),
51 52
	OPT_BOOLEAN(0, "mirror", &option_mirror,
		    "create a mirror repository (implies bare)"),
D
Daniel Barkalow 已提交
53 54 55 56 57 58 59 60 61 62 63
	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"),
	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 已提交
64
		   "use <branch> instead of 'origin' to track upstream"),
D
Daniel Barkalow 已提交
65 66 67 68 69 70 71 72 73 74 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()
};

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]);
83
		if (is_directory(path)) {
D
Daniel Barkalow 已提交
84
			*is_bundle = 0;
85
			return xstrdup(make_nonrelative_path(path));
D
Daniel Barkalow 已提交
86 87 88 89 90 91 92 93
		}
	}

	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;
94
			return xstrdup(make_nonrelative_path(path));
D
Daniel Barkalow 已提交
95 96 97 98 99 100
		}
	}

	return NULL;
}

101
static char *guess_dir_name(const char *repo, int is_bundle, int is_bare)
D
Daniel Barkalow 已提交
102
{
103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134
	const char *end = repo + strlen(repo), *start;

	/*
	 * Strip trailing slashes and /.git
	 */
	while (repo < end && is_dir_sep(end[-1]))
		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 已提交
135 136
	}

137
	if (is_bare) {
138 139 140
		struct strbuf result = STRBUF_INIT;
		strbuf_addf(&result, "%.*s.git", (int)(end - start), start);
		return strbuf_detach(&result, 0);
141 142
	}

D
Daniel Barkalow 已提交
143 144 145
	return xstrndup(start, end - start);
}

146 147 148 149 150 151 152 153 154
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 已提交
155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186
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);
}

187
static void copy_or_link_directory(struct strbuf *src, struct strbuf *dest)
D
Daniel Barkalow 已提交
188 189 190 191 192 193
{
	struct dirent *de;
	struct stat buf;
	int src_len, dest_len;
	DIR *dir;

194
	dir = opendir(src->buf);
D
Daniel Barkalow 已提交
195
	if (!dir)
196
		die("failed to open %s", src->buf);
D
Daniel Barkalow 已提交
197

198
	if (mkdir(dest->buf, 0777)) {
D
Daniel Barkalow 已提交
199
		if (errno != EEXIST)
200
			die("failed to create directory %s", dest->buf);
201
		else if (stat(dest->buf, &buf))
202
			die("failed to stat %s", dest->buf);
D
Daniel Barkalow 已提交
203
		else if (!S_ISDIR(buf.st_mode))
204
			die("%s exists and is not a directory", dest->buf);
D
Daniel Barkalow 已提交
205 206
	}

207 208 209 210
	strbuf_addch(src, '/');
	src_len = src->len;
	strbuf_addch(dest, '/');
	dest_len = dest->len;
D
Daniel Barkalow 已提交
211 212

	while ((de = readdir(dir)) != NULL) {
213 214 215 216 217 218
		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 已提交
219 220 221 222 223 224 225 226
			continue;
		}
		if (S_ISDIR(buf.st_mode)) {
			if (de->d_name[0] != '.')
				copy_or_link_directory(src, dest);
			continue;
		}

227
		if (unlink(dest->buf) && errno != ENOENT)
228
			die("failed to unlink %s", dest->buf);
229
		if (!option_no_hardlinks) {
230
			if (!link(src->buf, dest->buf))
231 232
				continue;
			if (option_local)
233
				die("failed to create link %s", dest->buf);
234
			option_no_hardlinks = 1;
D
Daniel Barkalow 已提交
235
		}
236
		if (copy_file(dest->buf, src->buf, 0666))
237
			die("failed to copy file to %s", dest->buf);
D
Daniel Barkalow 已提交
238
	}
239
	closedir(dir);
D
Daniel Barkalow 已提交
240 241 242 243 244 245
}

static const struct ref *clone_local(const char *src_repo,
				     const char *dest_repo)
{
	const struct ref *ret;
246 247
	struct strbuf src = STRBUF_INIT;
	struct strbuf dest = STRBUF_INIT;
D
Daniel Barkalow 已提交
248 249 250 251 252 253
	struct remote *remote;
	struct transport *transport;

	if (option_shared)
		add_to_alternates_file(src_repo);
	else {
254 255 256 257 258
		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 已提交
259 260 261 262 263 264 265 266 267 268 269 270 271 272 273
	}

	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;
pid_t junk_pid;

static void remove_junk(void)
{
274
	struct strbuf sb = STRBUF_INIT;
D
Daniel Barkalow 已提交
275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291
	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();
292
	sigchain_pop(signo);
D
Daniel Barkalow 已提交
293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340
	raise(signo);
}

static const struct ref *locate_head(const struct ref *refs,
				     const struct ref *mapped_refs,
				     const struct ref **remote_head_p)
{
	const struct ref *remote_head = NULL;
	const struct ref *remote_master = NULL;
	const struct ref *r;
	for (r = refs; r; r = r->next)
		if (!strcmp(r->name, "HEAD"))
			remote_head = r;

	for (r = mapped_refs; r; r = r->next)
		if (!strcmp(r->name, "refs/heads/master"))
			remote_master = r;

	if (remote_head_p)
		*remote_head_p = remote_head;

	/* If there's no HEAD value at all, never mind. */
	if (!remote_head)
		return NULL;

	/* If refs/heads/master could be right, it is. */
	if (remote_master && !hashcmp(remote_master->old_sha1,
				      remote_head->old_sha1))
		return remote_master;

	/* Look for another ref that points there */
	for (r = mapped_refs; r; r = r->next)
		if (r != remote_head &&
		    !hashcmp(r->old_sha1, remote_head->old_sha1))
			return r;

	/* Nothing is the same */
	return NULL;
}

static struct ref *write_remote_refs(const struct ref *refs,
		struct refspec *refspec, const char *reflog)
{
	struct ref *local_refs = NULL;
	struct ref **tail = &local_refs;
	struct ref *r;

	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

	for (r = local_refs; r; r = r->next)
J
Johan Herland 已提交
345 346 347 348 349
		add_extra_ref(r->peer_ref->name, r->old_sha1, 0);

	pack_refs(PACK_REFS_ALL);
	clear_extra_refs();

D
Daniel Barkalow 已提交
350 351 352
	return local_refs;
}

353 354 355 356 357 358 359 360 361 362 363 364 365
static void install_branch_config(const char *local,
				  const char *origin,
				  const char *remote)
{
	struct strbuf key = STRBUF_INIT;
	strbuf_addf(&key, "branch.%s.remote", local);
	git_config_set(key.buf, origin);
	strbuf_reset(&key);
	strbuf_addf(&key, "branch.%s.merge", local);
	git_config_set(key.buf, remote);
	strbuf_release(&key);
}

D
Daniel Barkalow 已提交
366 367 368 369 370 371 372 373
int cmd_clone(int argc, const char **argv, const char *prefix)
{
	int use_local_hardlinks = 1;
	int use_separate_remote = 1;
	int is_bundle = 0;
	struct stat buf;
	const char *repo_name, *repo, *work_tree, *git_dir;
	char *path, *dir;
374
	int dest_exists;
D
Daniel Barkalow 已提交
375
	const struct ref *refs, *head_points_at, *remote_head, *mapped_refs;
376 377
	struct strbuf key = STRBUF_INIT, value = STRBUF_INIT;
	struct strbuf branch_top = STRBUF_INIT, reflog_msg = STRBUF_INIT;
378
	struct transport *transport = NULL;
379
	char *src_ref_prefix = "refs/heads/";
D
Daniel Barkalow 已提交
380 381 382 383 384 385 386 387 388 389 390 391 392 393

	struct refspec refspec;

	junk_pid = getpid();

	argc = parse_options(argc, argv, builtin_clone_options,
			     builtin_clone_usage, 0);

	if (argc == 0)
		die("You must specify a repository to clone.");

	if (option_no_hardlinks)
		use_local_hardlinks = 0;

394 395 396
	if (option_mirror)
		option_bare = 1;

D
Daniel Barkalow 已提交
397 398 399 400 401 402 403 404 405 406 407 408 409 410 411
	if (option_bare) {
		if (option_origin)
			die("--bare and --origin %s options are incompatible.",
			    option_origin);
		option_no_checkout = 1;
		use_separate_remote = 0;
	}

	if (!option_origin)
		option_origin = "origin";

	repo_name = argv[0];

	path = get_repo_path(repo_name, &is_bundle);
	if (path)
412
		repo = xstrdup(make_nonrelative_path(repo_name));
D
Daniel Barkalow 已提交
413 414 415 416 417 418 419 420
	else if (!strchr(repo_name, ':'))
		repo = xstrdup(make_absolute_path(repo_name));
	else
		repo = repo_name;

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

424 425 426 427
	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 已提交
428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447

	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;
448
		if (safe_create_leading_directories_const(work_tree) < 0)
449 450
			die("could not create leading directories of '%s': %s",
					work_tree, strerror(errno));
451
		if (!dest_exists && mkdir(work_tree, 0755))
452 453
			die("could not create work tree dir '%s': %s.",
					work_tree, strerror(errno));
D
Daniel Barkalow 已提交
454 455 456 457
		set_git_work_tree(work_tree);
	}
	junk_git_dir = git_dir;
	atexit(remove_junk);
458
	sigchain_push_common(remove_junk_on_signal);
D
Daniel Barkalow 已提交
459 460 461

	setenv(CONFIG_ENVIRONMENT, xstrdup(mkpath("%s/config", git_dir)), 1);

462 463
	if (safe_create_leading_directories_const(git_dir) < 0)
		die("could not create leading directories of '%s'", git_dir);
D
Daniel Barkalow 已提交
464 465 466 467
	set_git_dir(make_absolute_path(git_dir));

	init_db(option_template, option_quiet ? INIT_DB_QUIET : 0);

468 469 470 471 472 473 474
	/*
	 * 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 已提交
475 476 477
	if (option_reference)
		setup_reference(git_dir);

J
Junio C Hamano 已提交
478
	git_config(git_default_config, NULL);
D
Daniel Barkalow 已提交
479 480

	if (option_bare) {
481 482
		if (option_mirror)
			src_ref_prefix = "refs/";
483
		strbuf_addstr(&branch_top, src_ref_prefix);
D
Daniel Barkalow 已提交
484 485 486

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

490
	if (option_mirror || !option_bare) {
D
Daniel Barkalow 已提交
491
		/* Configure the remote */
492
		if (option_mirror) {
493 494 495
			strbuf_addf(&key, "remote.%s.mirror", option_origin);
			git_config_set(key.buf, "true");
			strbuf_reset(&key);
496 497
		}

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

502 503 504 505 506
		strbuf_addf(&key, "remote.%s.fetch", option_origin);
		strbuf_addf(&value, "+%s*:%s*", src_ref_prefix, branch_top.buf);
		git_config_set_multivar(key.buf, value.buf, "^$", 0);
		strbuf_reset(&key);
		strbuf_reset(&value);
D
Daniel Barkalow 已提交
507 508 509 510
	}

	refspec.force = 0;
	refspec.pattern = 1;
511
	refspec.src = src_ref_prefix;
512
	refspec.dst = branch_top.buf;
D
Daniel Barkalow 已提交
513 514 515 516 517

	if (path && !is_bundle)
		refs = clone_local(path, git_dir);
	else {
		struct remote *remote = remote_get(argv[0]);
518
		transport = transport_get(remote, remote->url[0]);
D
Daniel Barkalow 已提交
519

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

D
Daniel Barkalow 已提交
523 524 525 526 527 528 529 530
		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 已提交
531 532
		else if (option_verbose)
			transport->progress = 1;
D
Daniel Barkalow 已提交
533

534 535 536 537
		if (option_upload_pack)
			transport_set_option(transport, TRANS_OPT_UPLOADPACK,
					     option_upload_pack);

D
Daniel Barkalow 已提交
538
		refs = transport_get_remote_refs(transport);
539 540
		if(refs)
			transport_fetch_refs(transport, refs);
D
Daniel Barkalow 已提交
541 542
	}

543 544
	if (refs) {
		clear_extra_refs();
D
Daniel Barkalow 已提交
545

546
		mapped_refs = write_remote_refs(refs, &refspec, reflog_msg.buf);
D
Daniel Barkalow 已提交
547

548 549 550 551 552 553 554
		head_points_at = locate_head(refs, mapped_refs, &remote_head);
	}
	else {
		warning("You appear to have cloned an empty repository.");
		head_points_at = NULL;
		remote_head = NULL;
		option_no_checkout = 1;
555 556 557
		if (!option_bare)
			install_branch_config("master", option_origin,
					      "refs/heads/master");
558
	}
D
Daniel Barkalow 已提交
559 560 561 562 563 564

	if (head_points_at) {
		/* Local default branch link */
		create_symref("HEAD", head_points_at->name, NULL);

		if (!option_bare) {
565
			struct strbuf head_ref = STRBUF_INIT;
D
Daniel Barkalow 已提交
566 567 568 569 570 571 572 573 574 575 576 577
			const char *head = head_points_at->name;

			if (!prefixcmp(head, "refs/heads/"))
				head += 11;

			/* Set up the initial local branch */

			/* Local branch initial value */
			update_ref(reflog_msg.buf, "HEAD",
				   head_points_at->old_sha1,
				   NULL, 0, DIE_ON_ERR);

578
			strbuf_addstr(&head_ref, branch_top.buf);
D
Daniel Barkalow 已提交
579 580 581 582 583 584 585
			strbuf_addstr(&head_ref, "HEAD");

			/* Remote branch link */
			create_symref(head_ref.buf,
				      head_points_at->peer_ref->name,
				      reflog_msg.buf);

586 587
			install_branch_config(head, option_origin,
					      head_points_at->name);
D
Daniel Barkalow 已提交
588 589 590 591 592 593 594 595 596 597 598 599 600 601 602
		}
	} else if (remote_head) {
		/* Source had detached HEAD pointing somewhere. */
		if (!option_bare)
			update_ref(reflog_msg.buf, "HEAD",
				   remote_head->old_sha1,
				   NULL, REF_NODEREF, DIE_ON_ERR);
	} else {
		/* Nothing to checkout out */
		if (!option_no_checkout)
			warning("remote HEAD refers to nonexistent ref, "
				"unable to checkout.\n");
		option_no_checkout = 1;
	}

603 604 605
	if (transport)
		transport_unlock_pack(transport);

D
Daniel Barkalow 已提交
606 607 608 609 610 611 612 613 614 615 616 617 618 619
	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;
620 621
		opts.merge = 1;
		opts.fn = oneway_merge;
D
Daniel Barkalow 已提交
622
		opts.verbose_update = !option_quiet;
623
		opts.src_index = &the_index;
D
Daniel Barkalow 已提交
624 625 626 627 628 629 630 631 632 633 634 635 636
		opts.dst_index = &the_index;

		tree = parse_tree_indirect(remote_head->old_sha1);
		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");
	}

	strbuf_release(&reflog_msg);
637 638 639
	strbuf_release(&branch_top);
	strbuf_release(&key);
	strbuf_release(&value);
D
Daniel Barkalow 已提交
640 641 642
	junk_pid = 0;
	return 0;
}