diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2009-11-09 09:04:58 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-10 10:50:19 -0800 |
| commit | d629c40b0b8b63b0c8b33d52dcba0ed202d898d7 (patch) | |
| tree | 44dfa22511bb28cc62d7d27f32e8d354c4169ed9 /builtin-merge.c | |
| parent | 6586b1f3465a93e908664ea24fa2f5ff47a587e3 (diff) | |
| download | git-d629c40b0b8b63b0c8b33d52dcba0ed202d898d7.tar.gz | |
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>
Diffstat (limited to 'builtin-merge.c')
| -rw-r--r-- | builtin-merge.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/builtin-merge.c b/builtin-merge.c index b6b84286b2..e95c5dc717 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()) |