Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint

[git.git] / environment.c

diff --git a/environment.c b/environment.c
index 9ebf485a738740fe6ad0ebaa5c5bf4695ee527ef..801a005ef1b23ef13cfa9ece676c550fe35dedc0 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -42,6 +42,14 @@ enum safe_crlf safe_crlf = SAFE_CRLF_WARN;
 unsigned whitespace_rule_cfg = WS_DEFAULT_RULE;
 enum branch_track git_branch_track = BRANCH_TRACK_REMOTE;
 enum rebase_setup_type autorebase = AUTOREBASE_NEVER;
+enum push_default_type push_default = PUSH_DEFAULT_UNSPECIFIED;
+#ifndef OBJECT_CREATION_MODE
+#define OBJECT_CREATION_MODE OBJECT_CREATION_USES_HARDLINKS
+#endif
+enum object_creation_mode object_creation_mode = OBJECT_CREATION_MODE;
+
+/* Parallel index stat data preload? */
+int core_preload_index = 0;
 
 /* This is set by setup_git_dir_gently() and/or git_default_config() */
 char *git_work_tree_cfg;
@@ -80,6 +88,11 @@ int is_bare_repository(void)
        return is_bare_repository_cfg && !get_git_work_tree();
 }
 
+int have_git_dir(void)
+{
+       return !!git_dir;
+}
+
 const char *get_git_dir(void)
 {
        if (!git_dir)