mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
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>
This commit is contained in:
parent
6586b1f346
commit
d629c40b0b
|
@ -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())
|
||||
|
|
Loading…
Reference in a new issue