From: Jonathan Nieder Date: Mon, 09 Nov 2009 15:04:58 GMT Subject: [PATCH 18/24] merge: do not setup worktree twice Message-ID: <1257779104-23884-18-git-send-email-jrnieder@gmail.com> In-Reply-To: <20091109150235.GA23871@progeny.tock> Builtins do not need to run setup_worktree() for themselves, since the builtin machinery runs it for them. Signed-off-by: Jonathan Nieder --- This matter since '-h' cannot suppress _this_ setup_work_tree() through the builtin machinery. builtin-merge.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/builtin-merge.c b/builtin-merge.c index c69a305..1857138 100644 --- a/builtin-merge.c +++ b/builtin-merge.c @@ -843,7 +843,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()) -- 1.6.5.2