fix GIT_EXEC_PATH to point to bundle/git-core
authorJoey Hess <joeyh@joeyh.name>
Thu, 14 Nov 2019 23:20:28 +0000 (19:20 -0400)
committerJoey Hess <joeyh@joeyh.name>
Thu, 14 Nov 2019 23:20:28 +0000 (19:20 -0400)
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

index 56d8349f2816e26afc852f0fbb9b660b128f2728..557c59e224fdc511cdc3e9a10178ed1fe5a88c47 100755 (executable)
@@ -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"