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>
Jonathan Nieder committed
Nov 9, 2009 at 09:04 UTC
d629c40b0b8b63b0c8b33d52dcba0ed202d898d7
1 file changed
-1
builtin-merge.c
-1
@@ -840,7 +840,6 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
840
const char *best_strategy = NULL, *wt_strategy = NULL;
841
struct commit_list **remotes = &remoteheads;
842
843
- setup_work_tree();
843
if (file_exists(git_path("MERGE_HEAD")))
844
die("You have not concluded your merge. (MERGE_HEAD exists)");
845
if (read_cache_unmerged())