[PATCH 18/24] merge: do not setup worktree twice
From: Jonathan Nieder <hidden>
Date: 2016-06-15 22:47:41
Subsystem:
the rest · Maintainer:
Linus Torvalds
Builtins do not need to run setup_worktree() for themselves, since the builtin machinery runs it for them. Signed-off-by: Jonathan Nieder <redacted> --- 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