From 8ea269ef754158bd0f4b256e82fdfa9037078a85 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 14 Nov 2019 19:20:28 -0400 Subject: [PATCH] fix GIT_EXEC_PATH to point to bundle/git-core This makes it be the same as in the linux runshell. It may be that bundle/ used to have all the necessary binaries in it, but that seems unlikely. I think that the breakage fixed by my previous commit masked this other breakage, and anything git execs from git-core (as opposed to being buitin) has never worked in the OSX dmg. --- standalone/osx/git-annex.app/Contents/MacOS/runshell | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/standalone/osx/git-annex.app/Contents/MacOS/runshell b/standalone/osx/git-annex.app/Contents/MacOS/runshell index 56d8349f28..557c59e224 100755 --- a/standalone/osx/git-annex.app/Contents/MacOS/runshell +++ b/standalone/osx/git-annex.app/Contents/MacOS/runshell @@ -69,7 +69,7 @@ export PATH ORIG_GIT_EXEC_PATH="$GIT_EXEC_PATH" export ORIG_GIT_EXEC_PATH -GIT_EXEC_PATH="$bundle" +GIT_EXEC_PATH="$bundle/git-core" export GIT_EXEC_PATH ORIG_GIT_TEMPLATE_DIR="$GIT_TEMPLATE_DIR" -- 2.30.2