Do not use GUID on dir in git init --shared=all on FreeBSD

diff --git a/unpack-trees.h b/unpack-trees.h
index 197a0044aa71fc9ca310b36b279b8382487a40a7..a2df544d040adc21f7d854ad50c53e61cf74c9ae 100644 (file)
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -16,6 +16,8 @@ struct unpack_trees_options {
        int trivial_merges_only;
        int verbose_update;
        int aggressive;
+       int skip_unmerged;
+       int gently;
        const char *prefix;
        int pos;
        struct dir_struct *dir;