[PATCH 1/9] "git read-tree -m" and the like require worktree

From

Nguyễn Thái Ngọc Duy <pclouds@gmail.com>

Date

Feb 27, 2008, 16:38 UTC

Message-ID

<20080227163810.GA28016@laptop>

In-Reply-To

<cover.1204130175.git.pclouds@gmail.com>

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
 builtin-read-tree.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/builtin-read-tree.c b/builtin-read-tree.c
index e78cf69..95318e3 100644
--- a/builtin-read-tree.c
+++ b/builtin-read-tree.c
@@ -219,6 +219,9 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
 	if ((opts.dir && !opts.update))
 		die("--exclude-per-directory is meaningless unless -u");
 
+	if (opts.merge)
+		setup_work_tree();
+
 	if (opts.prefix) {
 		int pfxlen = strlen(opts.prefix);
 		int pos;

-- 
1.5.4.2.281.g28d0e