Merge the attributes fix in from maint-1.6.6 branch

[git.git] / unpack-trees.h

diff --git a/unpack-trees.h b/unpack-trees.h
index 64f02cb03ab242ac08ea0f1afbb24e71cf6664aa..5e432f576eb2304a63510a61a71182e11f777092 100644 (file)
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -46,11 +46,13 @@ struct unpack_trees_options {
                     debug_unpack,
                     skip_sparse_checkout,
                     gently,
+                    exiting_early,
                     show_all_errors,
                     dry_run;
        const char *prefix;
        int cache_bottom;
        struct dir_struct *dir;
+       struct pathspec *pathspec;
        merge_fn_t fn;
        const char *msgs[NB_UNPACK_TREES_ERROR_TYPES];
        /*