Replace open-coded version of hash_sha1_file()

diff --git a/environment.c b/environment.c
index 1ce34118dd6df33b60b1ea5e0c75c5fdf4b1aa84..63b1d155be1aca2f9fe7aad5f747c06b9102fd60 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -13,76 +13,45 @@ char git_default_email[MAX_GITNAME];
 char git_default_name[MAX_GITNAME];
 int use_legacy_headers = 1;
 int trust_executable_bit = 1;
-int assume_unchanged = 0;
-int prefer_symlink_refs = 0;
-int log_all_ref_updates = 0;
+int assume_unchanged;
+int prefer_symlink_refs;
+int log_all_ref_updates;
 int warn_ambiguous_refs = 1;
-int repository_format_version = 0;
+int repository_format_version;
 char git_commit_encoding[MAX_ENCODING_LENGTH] = "utf-8";
 int shared_repository = PERM_UMASK;
-const char *apply_default_whitespace = NULL;
+int deny_non_fast_forwards = 0;
+const char *apply_default_whitespace;
 int zlib_compression_level = Z_DEFAULT_COMPRESSION;
 int pager_in_use;
 int pager_use_color = 1;
 
-static int dyn_git_object_dir, dyn_git_index_file, dyn_git_graft_file;
-static char *git_dir, *git_object_dir, *git_index_file, *git_refs_dir,
-       *git_graft_file;
+static const char *git_dir;
+static char *git_object_dir, *git_index_file, *git_refs_dir, *git_graft_file;
 
-void setup_git(char *new_git_dir, char *new_git_object_dir,
-               char *new_git_index_file, char *new_git_graft_file)
+static void setup_git_env(void)
 {
-       git_dir = new_git_dir;
+       git_dir = getenv(GIT_DIR_ENVIRONMENT);
        if (!git_dir)
                git_dir = DEFAULT_GIT_DIR_ENVIRONMENT;
-
-       if (dyn_git_object_dir)
-               free(git_object_dir);
-       git_object_dir = new_git_object_dir;
+       git_object_dir = getenv(DB_ENVIRONMENT);
        if (!git_object_dir) {
                git_object_dir = xmalloc(strlen(git_dir) + 9);
                sprintf(git_object_dir, "%s/objects", git_dir);
-               dyn_git_object_dir = 1;
-       } else {
-               dyn_git_object_dir = 0;
        }
-
-       if (git_refs_dir)
-               free(git_refs_dir);
        git_refs_dir = xmalloc(strlen(git_dir) + 6);
        sprintf(git_refs_dir, "%s/refs", git_dir);
-
-       if (dyn_git_index_file)
-               free(git_index_file);
-       git_index_file = new_git_index_file;
+       git_index_file = getenv(INDEX_ENVIRONMENT);
        if (!git_index_file) {
                git_index_file = xmalloc(strlen(git_dir) + 7);
                sprintf(git_index_file, "%s/index", git_dir);
-               dyn_git_index_file = 1;
-       } else {
-               dyn_git_index_file = 0;
-       }
-
-       if (dyn_git_graft_file)
-               free(git_graft_file);
-       git_graft_file = new_git_graft_file;
-       if (!git_graft_file) {
-               git_graft_file = strdup(git_path("info/grafts"));
-               dyn_git_graft_file = 1;
-       } else {
-               dyn_git_graft_file = 0;
        }
+       git_graft_file = getenv(GRAFT_ENVIRONMENT);
+       if (!git_graft_file)
+               git_graft_file = xstrdup(git_path("info/grafts"));
 }
 
-static void setup_git_env(void)
-{
-       setup_git(getenv(GIT_DIR_ENVIRONMENT),
-                 getenv(DB_ENVIRONMENT),
-                 getenv(INDEX_ENVIRONMENT),
-                 getenv(GRAFT_ENVIRONMENT));
-}
-
-char *get_git_dir(void)
+const char *get_git_dir(void)
 {
        if (!git_dir)
                setup_git_env();