Merge branch 'hv/coding-guidelines' into maint-1.7.11

diff --git a/unpack-trees.h b/unpack-trees.h
index 5e432f576eb2304a63510a61a71182e11f777092..ec74a9f19a47c39de61def9709da6d4d6f1dcbdb 100644 (file)
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -52,6 +52,7 @@ struct unpack_trees_options {
        const char *prefix;
        int cache_bottom;
        struct dir_struct *dir;
+       struct path_exclude_check *path_exclude_check;
        struct pathspec *pathspec;
        merge_fn_t fn;
        const char *msgs[NB_UNPACK_TREES_ERROR_TYPES];