From: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon, 9 Nov 2009 15:04:58 +0000 (-0600)
Subject: merge: do not setup worktree twice
X-Git-Tag: v1.6.5.3~22
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d629c40b0b8b63b0c8b33d52dcba0ed202d898d7;p=git.git

merge: do not setup worktree twice

Builtins do not need to run setup_worktree() for themselves, since
the builtin machinery runs it for them.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin-merge.c b/builtin-merge.c
index b6b84286b..e95c5dc71 100644
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@ -840,7 +840,6 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
 	const char *best_strategy = NULL, *wt_strategy = NULL;
 	struct commit_list **remotes = &remoteheads;
 
-	setup_work_tree();
 	if (file_exists(git_path("MERGE_HEAD")))
 		die("You have not concluded your merge. (MERGE_HEAD exists)");
 	if (read_cache_unmerged())