mirror of
https://github.com/git/git
synced 2024-09-13 21:34:42 +00:00
32205655dc
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>
53 lines
1.3 KiB
C
53 lines
1.3 KiB
C
#include "cache.h"
|
|
#include "config.h"
|
|
#include "strbuf.h"
|
|
#include "fsmonitor.h"
|
|
#include "fsmonitor-ipc.h"
|
|
#include "fsmonitor-path-utils.h"
|
|
|
|
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;
|
|
git_SHA_CTX sha1ctx;
|
|
char *sock_dir = NULL;
|
|
struct strbuf ipc_file = STRBUF_INIT;
|
|
unsigned char hash[GIT_MAX_RAWSZ];
|
|
|
|
if (!r)
|
|
BUG("No repository passed into fsmonitor_ipc__get_path");
|
|
|
|
if (ipc_path)
|
|
return ipc_path;
|
|
|
|
|
|
/* By default the socket file is created in the .git directory */
|
|
if (fsmonitor__is_fs_remote(r->gitdir) < 1) {
|
|
ipc_path = fsmonitor_ipc__get_default_path();
|
|
return ipc_path;
|
|
}
|
|
|
|
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);
|
|
|
|
/* Create the socket file in either socketDir or $HOME */
|
|
if (sock_dir && *sock_dir) {
|
|
strbuf_addf(&ipc_file, "%s/.git-fsmonitor-%s",
|
|
sock_dir, hash_to_hex(hash));
|
|
} else {
|
|
strbuf_addf(&ipc_file, "~/.git-fsmonitor-%s", hash_to_hex(hash));
|
|
}
|
|
free(sock_dir);
|
|
|
|
ipc_path = interpolate_path(ipc_file.buf, 1);
|
|
if (!ipc_path)
|
|
die(_("Invalid path: %s"), ipc_file.buf);
|
|
|
|
strbuf_release(&ipc_file);
|
|
return ipc_path;
|
|
}
|