Merge branch 'maint-1.6.2' into maint

[thirdparty/git.git] / builtin-read-tree.c

diff --git a/builtin-read-tree.c b/builtin-read-tree.c
index 391d709704320dba7a918fdd79b68c6c604d33b2..82e25eaa0758d8b9584592f4072f81eeccb0bf1d 100644 (file)
--- a/builtin-read-tree.c
+++ b/builtin-read-tree.c
@@ -135,7 +135,7 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
                                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