summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joeyh@joeyh.name>2019-11-14 19:20:28 -0400
committerJoey Hess <joeyh@joeyh.name>2019-11-14 19:20:28 -0400
commit8ea269ef754158bd0f4b256e82fdfa9037078a85 (patch)
treef1fb9bec2f2053cb04e1f82c1cd6641d399f2a76
parentb3215264733f003c2262b2c28e197cb6e8d8a175 (diff)
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.
-rwxr-xr-xstandalone/osx/git-annex.app/Contents/MacOS/runshell2
1 files changed, 1 insertions, 1 deletions
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"