diff --git a/builtin-read-tree.c b/builtin-read-tree.c
index 0706c958181c54aeb18d91f6e3dbe7c9f572b94d..8e0273864d6af8de2a31868dcfbeda29cd36c2fc 100644 (file)
--- a/builtin-read-tree.c
+++ b/builtin-read-tree.c
die("more than one --exclude-per-directory are given.");
dir = xcalloc(1, sizeof(*opts.dir));
- dir->show_ignored = 1;
+ dir->flags |= DIR_SHOW_IGNORED;
dir->exclude_per_dir = arg + 24;
opts.dir = dir;
/* We do not need to nor want to do read-directory
break;
case 2:
opts.fn = twoway_merge;
- opts.initial_checkout = !active_nr;
+ opts.initial_checkout = is_cache_unborn();
break;
case 3:
default: