Merge branch 'jl/submodule-update-quiet' into maint

diff --git a/unpack-trees.h b/unpack-trees.h
index 4c6c54033e2d319a305e9a82d06e48e570f4f871..79989483079970e9dad42512e522eef8ea2a75a4 100644 (file)
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -47,7 +47,8 @@ struct unpack_trees_options {
                     skip_sparse_checkout,
                     gently,
                     exiting_early,
-                    show_all_errors;
+                    show_all_errors,
+                    dry_run;
        const char *prefix;
        int cache_bottom;
        struct dir_struct *dir;