From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 28 Feb 2008 00:48:10 GMT
Subject: Re: [PATCH 1/9] "git read-tree -m" and the like require worktree
Message-ID: <7vhcftnbxx.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <20080227163810.GA28016@laptop>

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

> 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;

How would this interact with "read-tree -m -i"?