Merge branch 'cn/maint-rev-list-doc' into maint-1.7.8

[git.git] / unpack-trees.h

diff --git a/unpack-trees.h b/unpack-trees.h
index cd11a08365ab3e27b1321b3df87bcab6b9278f90..5e432f576eb2304a63510a61a71182e11f777092 100644 (file)
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -46,10 +46,13 @@ struct unpack_trees_options {
                     debug_unpack,
                     skip_sparse_checkout,
                     gently,
-                    show_all_errors;
+                    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];
        /*