{"thread":{"id":"15246","subject":"[PATCH] read-tree: setup worktree if merge is required","startedAt":"2008-08-28T13:03:22Z","lastAt":"2008-08-28T13:03:22Z","messageCount":1,"participants":["Nguyễn Thái Ngọc Duy"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"88881","messageId":"1219928602-25155-1-git-send-email-pclouds@gmail.com","threadId":"15246","inReplyTo":null,"subject":"[PATCH] read-tree: setup worktree if merge is required","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2008-08-28T13:03:22Z","receivedAt":"2008-08-28T13:03:22Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"\nSigned-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>\n---\n builtin-read-tree.c |    2 ++\n 1 files changed, 2 insertions(+), 0 deletions(-)\n\ndiff --git a/builtin-read-tree.c b/builtin-read-tree.c\nindex 72a6de3..dddc304 100644\n--- a/builtin-read-tree.c\n+++ b/builtin-read-tree.c\n@@ -194,6 +194,8 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)\n \t\tusage(read_tree_usage);\n \tif ((opts.dir && !opts.update))\n \t\tdie(\"--exclude-per-directory is meaningless unless -u\");\n+\tif (opts.merge && !opts.index_only)\n+\t\tsetup_work_tree();\n \n \tif (opts.merge) {\n \t\tif (stage < 2)\n-- \n1.6.0.96.g2fad1.dirty\n"}]}