summaryrefslogtreecommitdiff
path: root/repository.c
diff options
context:
space:
mode:
authorbrian m. carlson <sandals@crustytoothpaste.net>2017-11-12 21:28:53 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-11-13 04:20:44 (GMT)
commit78a6766802ef32b82e6062e8e6ac5621894cc4a2 (patch)
treef482c347f6b747f214c43275822e4b08086772b2 /repository.c
parentf50e766b7b3dd02fc44ff7d4339c6f62e70fbf60 (diff)
downloadgit-78a6766802ef32b82e6062e8e6ac5621894cc4a2.zip
git-78a6766802ef32b82e6062e8e6ac5621894cc4a2.tar.gz
git-78a6766802ef32b82e6062e8e6ac5621894cc4a2.tar.bz2
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>
Diffstat (limited to 'repository.c')
-rw-r--r--repository.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/repository.c b/repository.c
index bb2fae5..c6ceb9f 100644
--- a/repository.c
+++ b/repository.c
@@ -64,6 +64,11 @@ void repo_set_gitdir(struct repository *repo, const char *path)
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.
@@ -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;
+ repo_set_hash_algo(repo, format.hash_algo);
+
if (worktree)
repo_set_worktree(repo, worktree);