Changeset 782 for git/branches/dmik/environment.c

Timestamp:

Jun 23, 2014, 9:45:51 PM (11 years ago)

Author:

dmik

Message:

git: Merge version 2.0.0 from vendor to dmik branch.

Location:

git/branches/dmik

Files:

• . (modified) (1 prop)
• environment.c (modified) (13 diffs)

git/branches/dmik/environment.c ¶

@@ -11 +11 @@
 #include "refs.h"
 #include "fmt-merge-msg.h"
-
-char git_default_email[MAX_GITNAME];
-char git_default_name[MAX_GITNAME];
-int user_ident_explicitly_given;
+#include "commit.h"
+
 int trust_executable_bit = 1;
 int trust_ctime = 1;
+int check_stat = 1;
 int has_symlinks = 1;
 int minimum_abbrev = 4, default_abbrev = 7;
@@ -25 +24 @@
 int log_all_ref_updates = -1; /* unspecified */
 int warn_ambiguous_refs = 1;
+int warn_on_object_refname_ambiguity = 1;
 int repository_format_version;
 const char *git_commit_encoding;
@@ -40 +40 @@
 size_t delta_base_cache_limit = 16 * 1024 * 1024;
 unsigned long big_file_threshold = 512 * 1024 * 1024;
-const char *log_pack_access;
 const char *pager_program;
 int pager_use_color = 1;
@@ -47 +46 @@
 const char *excludes_file;
 enum auto_crlf auto_crlf = AUTO_CRLF_FALSE;
-int read_replace_refs = 1; /* NEEDSWORK: rename to use_replace_refs */
+int check_replace_refs = 1;
 enum eol core_eol = EOL_UNSET;
 enum safe_crlf safe_crlf = SAFE_CRLF_WARN;
@@ -53 +52 @@
 enum branch_track git_branch_track = BRANCH_TRACK_REMOTE;
 enum rebase_setup_type autorebase = AUTOREBASE_NEVER;
-enum push_default_type push_default = PUSH_DEFAULT_MATCHING;
+enum push_default_type push_default = PUSH_DEFAULT_UNSPECIFIED;
 #ifndef OBJECT_CREATION_MODE
 #define OBJECT_CREATION_MODE OBJECT_CREATION_USES_HARDLINKS
@@ -62 +61 @@
 int core_apply_sparse_checkout;
 int merge_log_config = -1;
+int precomposed_unicode = -1; /* see probe_utf8_pathname_composition() */
 struct startup_info *startup_info;
 unsigned long pack_size_limit_cfg;
+
+/*
+ * The character that begins a commented line in user-editable file
+ * that is subject to stripspace.
+ */
+char comment_line_char = '#';
 
 /* Parallel index stat data preload? */
@@ -79 +85 @@
 
 /*
- * Repository-local GIT_* environment variables
- * Remember to update local_repo_env_size in cache.h when
- * the size of the list changes
- */
-const char * const local_repo_env[LOCAL_REPO_ENV_SIZE + 1] = {
+ * Repository-local GIT_* environment variables; see cache.h for details.
+ */
+const char * const local_repo_env[] = {
         ALTERNATE_DB_ENVIRONMENT,
         CONFIG_ENVIRONMENT,
@@ -90 +94 @@
         GIT_DIR_ENVIRONMENT,
         GIT_WORK_TREE_ENVIRONMENT,
+        GIT_IMPLICIT_WORK_TREE_ENVIRONMENT,
         GRAFT_ENVIRONMENT,
         INDEX_ENVIRONMENT,
         NO_REPLACE_OBJECTS_ENVIRONMENT,
+        GIT_PREFIX_ENVIRONMENT,
+        GIT_SHALLOW_FILE_ENVIRONMENT,
         NULL
 };
@@ -119 +126 @@
 static void setup_git_env(void)
 {
+        const char *gitfile;
+        const char *shallow_file;
+
         git_dir = getenv(GIT_DIR_ENVIRONMENT);
-        git_dir = git_dir ? xstrdup(git_dir) : NULL;
-        if (!git_dir) {
-                git_dir = read_gitfile(DEFAULT_GIT_DIR_ENVIRONMENT);
-                git_dir = git_dir ? xstrdup(git_dir) : NULL;
-        }
         if (!git_dir)
                 git_dir = DEFAULT_GIT_DIR_ENVIRONMENT;
+        gitfile = read_gitfile(git_dir);
+        git_dir = xstrdup(gitfile ? gitfile : git_dir);
         git_object_dir = getenv(DB_ENVIRONMENT);
         if (!git_object_dir) {
@@ -141 +148 @@
                 git_graft_file = git_pathdup("info/grafts");
         if (getenv(NO_REPLACE_OBJECTS_ENVIRONMENT))
-                read_replace_refs = 0;
+                check_replace_refs = 0;
         namespace = expand_namespace(getenv(GIT_NAMESPACE_ENVIRONMENT));
         namespace_len = strlen(namespace);
+        shallow_file = getenv(GIT_SHALLOW_FILE_ENVIRONMENT);
+        if (shallow_file)
+                set_alternate_shallow_file(shallow_file, 0);
 }
 
@@ -152 +162 @@
 }
 
-int have_git_dir(void)
-{
-        return !!git_dir;
-}
-
 const char *get_git_dir(void)
 {
@@ -173 +178 @@
 const char *strip_namespace(const char *namespaced_ref)
 {
-        if (prefixcmp(namespaced_ref, get_git_namespace()) != 0)
+        if (!starts_with(namespaced_ref, get_git_namespace()))
                 return NULL;
         return namespaced_ref + namespace_len;
@@ -233 +238 @@
 }
 
-int odb_pack_keep(char *name, size_t namesz, unsigned char *sha1)
+int odb_pack_keep(char *name, size_t namesz, const unsigned char *sha1)
 {
         int fd;