undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ab/macos-build-fix-with-sha1dc'

Browse Source 
Enable macOS build with sha1dc hash function.

* ab/macos-build-fix-with-sha1dc:
  fsmonitor OSX: compile with DC_SHA1=YesPlease
This commit is contained in:
Junio C Hamano 2022-10-21 11:37:27 -07:00
commit cc7574322f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compat/fsmonitor/fsm-ipc-darwin.c
View File

@ -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) const char *fsmonitor_ipc__get_path(struct repository *r)
{ {
static const char *ipc_path = NULL; static const char *ipc_path = NULL;
SHA_CTX sha1ctx; git_SHA_CTX sha1ctx;
char *sock_dir = NULL; char *sock_dir = NULL;
struct strbuf ipc_file = STRBUF_INIT; struct strbuf ipc_file = STRBUF_INIT;
unsigned char hash[SHA_DIGEST_LENGTH]; unsigned char hash[GIT_MAX_RAWSZ];
if (!r) if (!r)
BUG("No repository passed into fsmonitor_ipc__get_path"); 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; return ipc_path;
} }
SHA1_Init(&sha1ctx); git_SHA1_Init(&sha1ctx);
SHA1_Update(&sha1ctx, r->worktree, strlen(r->worktree)); git_SHA1_Update(&sha1ctx, r->worktree, strlen(r->worktree));
SHA1_Final(hash, &sha1ctx); git_SHA1_Final(hash, &sha1ctx);
repo_config_get_string(r, "fsmonitor.socketdir", &sock_dir); repo_config_get_string(r, "fsmonitor.socketdir", &sock_dir);