Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx> writes: > Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx> > --- > 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"? - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html