From: Nguyễn Thái Ngọc Duy Date: Sun, 02 Mar 2008 10:33:16 GMT Subject: [PATCH 01/10] "git read-tree -m" and the like require worktree Message-ID: <20080302103316.GA8902@laptop> In-Reply-To: Signed-off-by: Nguyễn Thái Ngọc Duy --- 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 0138f5a..a69bac4 100644 --- a/builtin-read-tree.c +++ b/builtin-read-tree.c @@ -220,6 +220,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 && !opts.index_only) + setup_work_tree(); + if (opts.prefix) { int pfxlen = strlen(opts.prefix); int pos; -- 1.5.4.2.281.g28d0e