X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=unpack-trees.h;h=5e432f576eb2304a63510a61a71182e11f777092;hb=d4c813d47d5c4f821a6947a29e4a480ec6522f44;hp=cd11a08365ab3e27b1321b3df87bcab6b9278f90;hpb=eb4e67288bb9d66fb46092fa30d72c4bdded0c2a;p=git.git diff --git a/unpack-trees.h b/unpack-trees.h index cd11a0836..5e432f576 100644 --- 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]; /*