mirror of
https://github.com/git/git
synced 2024-08-28 12:09:19 +00:00
fsmonitor OSX: compile with DC_SHA1=YesPlease
As we'll address in subsequent commits the "DC_SHA1=YesPlease" is not
on by default on OSX, instead we use Apple Common Crypto's SHA-1
implementation.
In 6beb2688d3
(fsmonitor: relocate socket file if .git directory is
remote, 2022-10-04) the build was broken with "DC_SHA1=YesPlease" (and
probably other non-"APPLE_COMMON_CRYPTO" SHA-1 backends).
So let's extract the fix for this from [1] to get the build working
again with "DC_SHA1=YesPlease". In addition to the fix in [1] we also
need to replace "SHA_DIGEST_LENGTH" with "GIT_MAX_RAWSZ".
1. https://lore.kernel.org/git/c085fc15b314abcb5e5ca6b4ee5ac54a28327cab.1665326258.git.gitgitgadget@gmail.com/
Signed-off-by: Eric DeCosta <edecosta@mathworks.com>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
c4f9490790
commit
32205655dc
|
@ -10,10 +10,10 @@ static GIT_PATH_FUNC(fsmonitor_ipc__get_default_path, "fsmonitor--daemon.ipc")
|
|||
const char *fsmonitor_ipc__get_path(struct repository *r)
|
||||
{
|
||||
static const char *ipc_path = NULL;
|
||||
SHA_CTX sha1ctx;
|
||||
git_SHA_CTX sha1ctx;
|
||||
char *sock_dir = NULL;
|
||||
struct strbuf ipc_file = STRBUF_INIT;
|
||||
unsigned char hash[SHA_DIGEST_LENGTH];
|
||||
unsigned char hash[GIT_MAX_RAWSZ];
|
||||
|
||||
if (!r)
|
||||
BUG("No repository passed into fsmonitor_ipc__get_path");
|
||||
|
@ -28,9 +28,9 @@ const char *fsmonitor_ipc__get_path(struct repository *r)
|
|||
return ipc_path;
|
||||
}
|
||||
|
||||
SHA1_Init(&sha1ctx);
|
||||
SHA1_Update(&sha1ctx, r->worktree, strlen(r->worktree));
|
||||
SHA1_Final(hash, &sha1ctx);
|
||||
git_SHA1_Init(&sha1ctx);
|
||||
git_SHA1_Update(&sha1ctx, r->worktree, strlen(r->worktree));
|
||||
git_SHA1_Final(hash, &sha1ctx);
|
||||
|
||||
repo_config_get_string(r, "fsmonitor.socketdir", &sock_dir);
|
||||
|
||||
|
|
Loading…
Reference in a new issue