X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=builtin-read-tree.c;h=dddc3044b8e42d3083f1f6db0d9c205f01e14141;hb=eaa2a6fc84bc02c1356353f7364e976e46133e98;hp=72a6de302f88728af17ce5c5c6983c5267afc6f6;hpb=588c038ac690e012a00dcace34fb318449f5ec7c;p=git.git

diff --git a/builtin-read-tree.c b/builtin-read-tree.c
index 72a6de302..dddc3044b 100644
--- a/builtin-read-tree.c
+++ b/builtin-read-tree.c
@@ -194,6 +194,8 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
 		usage(read_tree_usage);
 	if ((opts.dir && !opts.update))
 		die("--exclude-per-directory is meaningless unless -u");
+	if (opts.merge && !opts.index_only)
+		setup_work_tree();
 
 	if (opts.merge) {
 		if (stage < 2)