Integrate hash algorithm support with repo setup

In future versions of Git, we plan to support an additional hash
algorithm.  Integrate the enumeration of hash algorithms with repository
setup, and store a pointer to the enumerated data in struct repository.
Of course, we currently only support SHA-1, so hard-code this value in
read_repository_format.  In the future, we'll enumerate this value from
the configuration.

Add a constant, the_hash_algo, which points to the hash_algo structure
pointer in the repository global.  Note that this is the hash which is
used to serialize data to disk, not the hash which is used to display
items to the user.  The transition plan anticipates that these may be
different.  We can add an additional element in the future (say,
ui_hash_algo) to provide for this case.

Include repository.h in cache.h since we now need to have access to
these struct and variable definitions.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/cache.h b/cache.h
index cb7fb7c004beb0b228269469a2c389c248bb72d1..c238688f6c4056213554394c0c4469d23ebcba67 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -14,6 +14,7 @@
 #include "hash.h"
 #include "path.h"
 #include "sha1-array.h"
 #include "hash.h"
 #include "path.h"
 #include "sha1-array.h"

+#include "repository.h"

 
 #ifndef platform_SHA_CTX
 /*
 
 #ifndef platform_SHA_CTX
 /*


@@ -77,6 +78,8 @@ struct object_id {
        unsigned char hash[GIT_MAX_RAWSZ];
 };
 
        unsigned char hash[GIT_MAX_RAWSZ];
 };
 

+#define the_hash_algo the_repository->hash_algo
+

 #if defined(DT_UNKNOWN) && !defined(NO_D_TYPE_IN_DIRENT)
 #define DTYPE(de)      ((de)->d_type)
 #else
 #if defined(DT_UNKNOWN) && !defined(NO_D_TYPE_IN_DIRENT)
 #define DTYPE(de)      ((de)->d_type)
 #else


@@ -888,6 +891,7 @@ struct repository_format {
        int version;
        int precious_objects;
        int is_bare;
        int version;
        int precious_objects;
        int is_bare;

+       int hash_algo;

        char *work_tree;
        struct string_list unknown_extensions;
 };
        char *work_tree;
        struct string_list unknown_extensions;
 };

diff --git a/repository.c b/repository.c
index bb2fae5446b7ea8d2bfac87faa30c165f714d121..c6ceb9f9e4941e9df5396b329d5fb5c140f0d125 100644 (file)
--- a/repository.c
+++ b/repository.c
@@ -64,6 +64,11 @@ void repo_set_gitdir(struct repository *repo, const char *path)
        free(old_gitdir);
 }
 
        free(old_gitdir);
 }
 

+void repo_set_hash_algo(struct repository *repo, int hash_algo)
+{
+       repo->hash_algo = &hash_algos[hash_algo];
+}
+

 /*
  * Attempt to resolve and set the provided 'gitdir' for repository 'repo'.
  * Return 0 upon success and a non-zero value upon failure.
 /*
  * Attempt to resolve and set the provided 'gitdir' for repository 'repo'.
  * Return 0 upon success and a non-zero value upon failure.


@@ -136,6 +141,8 @@ int repo_init(struct repository *repo, const char *gitdir, const char *worktree)
        if (read_and_verify_repository_format(&format, repo->commondir))
                goto error;
 
        if (read_and_verify_repository_format(&format, repo->commondir))
                goto error;
 

+       repo_set_hash_algo(repo, format.hash_algo);
+

        if (worktree)
                repo_set_worktree(repo, worktree);
 
        if (worktree)
                repo_set_worktree(repo, worktree);
 

diff --git a/repository.h b/repository.h
index 7f5e24a0a24011393e9b1b9986895ebe8b3f10ab..0329e40c7f5e72dad3ba46328a8e3d6c29ed8e58 100644 (file)
--- a/repository.h
+++ b/repository.h
@@ -4,6 +4,7 @@
 struct config_set;
 struct index_state;
 struct submodule_cache;
 struct config_set;
 struct index_state;
 struct submodule_cache;

+struct git_hash_algo;

 
 struct repository {
        /* Environment */
 
 struct repository {
        /* Environment */


@@ -67,6 +68,9 @@ struct repository {
         */
        struct index_state *index;
 
         */
        struct index_state *index;
 

+       /* Repository's current hash algorithm, as serialized on disk. */
+       const struct git_hash_algo *hash_algo;
+

        /* Configurations */
        /*
         * Bit used during initialization to indicate if repository state (like
        /* Configurations */
        /*
         * Bit used during initialization to indicate if repository state (like


@@ -86,6 +90,7 @@ extern struct repository *the_repository;
 
 extern void repo_set_gitdir(struct repository *repo, const char *path);
 extern void repo_set_worktree(struct repository *repo, const char *path);
 
 extern void repo_set_gitdir(struct repository *repo, const char *path);
 extern void repo_set_worktree(struct repository *repo, const char *path);

+extern void repo_set_hash_algo(struct repository *repo, int algo);

 extern int repo_init(struct repository *repo, const char *gitdir, const char *worktree);
 extern int repo_submodule_init(struct repository *submodule,
                               struct repository *superproject,
 extern int repo_init(struct repository *repo, const char *gitdir, const char *worktree);
 extern int repo_submodule_init(struct repository *submodule,
                               struct repository *superproject,

diff --git a/setup.c b/setup.c
index cf1b22cd305dcbc10de616edc6b0b949e4d0a91b..50c6b2ab11fa3579a17079c16a4fb7241df9b875 100644 (file)
--- a/setup.c
+++ b/setup.c
@@ -488,6 +488,7 @@ int read_repository_format(struct repository_format *format, const char *path)
        memset(format, 0, sizeof(*format));
        format->version = -1;
        format->is_bare = -1;
        memset(format, 0, sizeof(*format));
        format->version = -1;
        format->is_bare = -1;

+       format->hash_algo = GIT_HASH_SHA1;

        string_list_init(&format->unknown_extensions, 1);
        git_config_from_file(check_repo_format, path, format);
        return format->version;
        string_list_init(&format->unknown_extensions, 1);
        git_config_from_file(check_repo_format, path, format);
        return format->version;


@@ -1113,6 +1114,8 @@ const char *setup_git_directory_gently(int *nongit_ok)
                        repo_set_gitdir(the_repository, gitdir);
                        setup_git_env();
                }
                        repo_set_gitdir(the_repository, gitdir);
                        setup_git_env();
                }

+               if (startup_info->have_repository)
+                       repo_set_hash_algo(the_repository, repo_fmt.hash_algo);

        }
 
        strbuf_release(&dir);
        }
 
        strbuf_release(&dir);