Skip to content

Instantly share code, notes, and snippets.

@Agnostic
Last active May 8, 2018 11:43
Show Gist options
  • Star 7 You must be signed in to star a gist
  • Fork 3 You must be signed in to fork a gist
  • Save Agnostic/d59b1c7fe76309486da0 to your computer and use it in GitHub Desktop.
Save Agnostic/d59b1c7fe76309486da0 to your computer and use it in GitHub Desktop.
/git-core/git-pull: line 11: git-sh-setup: No such file or directory (git pull Yosemite FIX)
// Open:
/Applications/Xcode.app/Contents/Developer/usr/libexec/git-core/git-pull
// Replace line 11 & 12
. git-sh-setup
. git-sh-i18n
// With this:
. /Applications/Xcode.app/Contents/Developer/usr/libexec/git-core/git-sh-setup
. /Applications/Xcode.app/Contents/Developer/usr/libexec/git-core/git-sh-i18n
// Find:
eval="git-merge $diffstat $no_commit $verify_signatures $edit $squash $no_ff $ff_only"
// And do the same:
eval="/Applications/Xcode.app/Contents/Developer/usr/libexec/git-core/git-merge $diffstat $no_commit $verify_signatures $edit $squash $no_ff $ff_only"
@Agnostic
Copy link
Author

Agnostic commented Jun 4, 2014

You may have Xcode.app in other path, just change it to yours.

@cr3ative
Copy link

cr3ative commented Nov 5, 2014

OH MY CHRIST THANK YOU

@geauxtigers
Copy link

Nice ... just what I needed ... Thanks!

@yratof
Copy link

yratof commented Feb 4, 2015

This fix worked for me too – good catch.
Hopefully this will get some traction and be fixed soon with xcode.

@tyjak
Copy link

tyjak commented Mar 2, 2015

Nice, the fix work like a charm but I had the same pb with /Applications/Xcode.app/Contents/Developer/usr/libexec/git-core/git-submodule I had to change :

  18 . git-sh-setup┓
  19 . git-sh-i18n┓
  20 . git-parse-remote┓

to

  18 . /Applications/Xcode.app/Contents/Developer/usr/libexec/git-core/git-sh-setup┓
  19 . /Applications/Xcode.app/Contents/Developer/usr/libexec/git-core/git-sh-i18n┓
  20 . /Applications/Xcode.app/Contents/Developer/usr/libexec/git-core/git-parse-remote┓

@thakurinbox
Copy link

Thanks! it works perfectly!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment