blocks|key|155725|text|作为临时解决方案，我将git-pull行11、12和336修改为：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|155726|.+/usr/local/Cellar/git/2.0.0/libexec/git-core/git-sh-setup

.+/usr/local/Cellar/git/2.0.0/libexec/git-core/git-sh-i18n

eval="/usr/local/Cellar/git/2.0.0/libexec/git-core/git-merge+$diffstat+$no_commit+$verify_signatures+$edit+$squash+$no_ff+$ff_only"|code-block|syntax|javascript|155727|这解决了git-pull问题，但我相信有更好的解决方案。|155728|entityMap^0|0|0|0^^$0|@$1|2|3|4|5|6|7|K|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|L|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|M|8|@]|9|@]|A|$]]|$1|I|3|-4|5|6|7|N|8|@]|9|@]|A|$]]]|J|$]]

As a temp solution I modified git-pull lines 11, 12, and 336 to be:

<pre><code>. /usr/local/Cellar/git/2.0.0/libexec/git-core/git-sh-setup

. /usr/local/Cellar/git/2.0.0/libexec/git-core/git-sh-i18n

eval="/usr/local/Cellar/git/2.0.0/libexec/git-core/git-merge $diffstat $no_commit $verify_signatures $edit $squash $no_ff $ff_only"
</code></pre>

This fixes git-pull for now, but I'm sure there is a better solution.

blocks|key|2953742|text|Ubiquill的变通方法也适用于git+rebase+(以及其他任何不起作用的函数)。在这种情况下，需要将47和48行替换为以下代码*|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2953743|.+/usr/local/Cellar/git/2.0.0/libexec/git-core/git-sh-setup
.+/usr/local/Cellar/git/2.0.0/libexec/git-core/git-sh-i18n|code-block|syntax|javascript|2953744|*此路径假设您已经安装了git和homebrew，并且它位于/usr/local/Cellar/git/2.0.0/中。|2953745|entityMap^0|0|0|0^^$0|@$1|2|3|4|5|6|7|K|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|L|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|M|8|@]|9|@]|A|$]]|$1|I|3|-4|5|6|7|N|8|@]|9|@]|A|$]]]|J|$]]

Ubiquill's workaround applies for git rebase (and presumably whichever other functions don't work) as well. In that case, it requires replacing lines 47 and 48 with the following *:

<pre><code>. /usr/local/Cellar/git/2.0.0/libexec/git-core/git-sh-setup
. /usr/local/Cellar/git/2.0.0/libexec/git-core/git-sh-i18n
</code></pre>

* This path assumes that you have git installed with homebrew, and it lives inside of /usr/local/Cellar/git/2.0.0/.

blocks|key|2741006|text|如果你需要Git在官方补丁出来之前工作，这里有一个临时补丁(假设是Homebrew和Git+2.0.0)。我设置了两个shell变量：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2741007|export+GIT_PATH="/usr/local/Cellar/git/2.0.0/bin"
export+GIT_CORE_PATH="/usr/local/Cellar/git/2.0.0/libexec/git-core"|code-block|syntax|javascript|2741008|..。然后用适当的绝对链接替换了git的实例。您可以使用以下要点来执行相同的操作：|offset|length|style|CODE|2741009|用git-sh-setup|2741010|Replace+/usr/local/Cellar/git/2.0.0/libexec/git-core/git-stash/替换/usr/local/Cellar/git/2.0.0/libexec/git-core/git-sh-setup/，用git-stash|unordered-list-item|BOLD|2741011|
|2741012|Replace+/usr/local/Cellar/git/2.0.0/libexec/git-core/git-pull/替换git-pull|2741013|
，使用|2741014|2741015|2741016|这肯定是一个技巧，但它会让你振作起来。|2741017|pilif编辑:在执行此操作之前，请确保您查看了@的答案...|2741018|entityMap|0|LINK|mutability|MUTABLE|url|https://gist.github.com/jbnunn/886fa1eb8a2a875402bc|1|https://gist.github.com/jbnunn/d0c1d2dfa68d7a680500|2|https://gist.github.com/jbnunn/a1363a021b979cfe1a7e^0|0|0|G|3|0|1|C|0|0|8|1J|1T|1M|3H|9|1|0|0|8|1I|1S|8|2|0|0|0|0|0|P|6|0^^$0|@$1|2|3|4|5|6|7|1G|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|1H|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|1I|8|@$I|1J|J|1K|K|L]]|9|@]|A|$]]|$1|M|3|N|5|6|7|1L|8|@]|9|@$I|1M|J|1N|1|1O]]|A|$]]|$1|O|3|P|5|Q|7|1P|8|@$I|1Q|J|1R|K|R]|$I|1S|J|1T|K|R]]|9|@$I|1U|J|1V|1|1W]]|A|$]]|$1|S|3|T|5|6|7|1X|8|@]|9|@]|A|$]]|$1|U|3|V|5|Q|7|1Y|8|@$I|1Z|J|20|K|R]]|9|@$I|21|J|22|1|23]]|A|$]]|$1|W|3|X|5|6|7|24|8|@]|9|@]|A|$]]|$1|Y|3|-4|5|Q|7|25|8|@]|9|@]|A|$]]|$1|Z|3|-4|5|6|7|26|8|@]|9|@]|A|$]]|$1|10|3|11|5|6|7|27|8|@]|9|@]|A|$]]|$1|12|3|13|5|6|7|28|8|@$I|29|J|2A|K|R]]|9|@]|A|$]]|$1|14|3|-4|5|6|7|2B|8|@]|9|@]|A|$]]]|15|$16|$5|17|18|19|A|$1A|1B]]|1C|$5|17|18|19|A|$1A|1D]]|1E|$5|17|18|19|A|$1A|1F]]]]

Here's a temporary fix (assuming Homebrew and Git 2.0.0) if you need Git to work before an official fix comes out. I setup two shell variables:

<pre><code>export GIT_PATH="/usr/local/Cellar/git/2.0.0/bin"
export GIT_CORE_PATH="/usr/local/Cellar/git/2.0.0/libexec/git-core"
</code></pre>

... and then replaced instances of <code>git</code> with appropriate absolute links. You can use the following Gists to do the same:

<ul>
<li>Replace /usr/local/Cellar/git/2.0.0/libexec/git-core/git-sh-setup/ with <a href="https://gist.github.com/jbnunn/886fa1eb8a2a875402bc" rel="nofollow">git-sh-setup</a></li>
<li>Replace /usr/local/Cellar/git/2.0.0/libexec/git-core/git-stash/ with <a href="https://gist.github.com/jbnunn/d0c1d2dfa68d7a680500" rel="nofollow">git-stash</a></li>
<li>Replace /usr/local/Cellar/git/2.0.0/libexec/git-core/git-pull/ with <a href="https://gist.github.com/jbnunn/a1363a021b979cfe1a7e" rel="nofollow">git-pull</a></li>
</ul>

This is a hack for sure, but it will get you going.

EDIT: Make sure you look at the answer from @pilif before doing this...

blocks|key|2953816|text|我相信这是使用zsh时iTerm中的一个错误。它们故意不调用/usr/bin/login，也没有像应有的那样使用execle清除环境变量。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2953817|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|D|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|E|8|@]|9|@]|A|$]]]|C|$]]

I believe this is a bug in iTerm when using zsh. They deliberately don't invoke /usr/bin/login, and they don't use execle to clear the environment variables like they should be.

blocks|key|154566|text|我认为目前最干净的解决方案是将iTerm会话中的初始命令更改为|type|unstyled|depth|inlineStyleRanges|entityRanges|data|154567|/usr/bin/login+-f+<your+user+name>|code-block|syntax|javascript|154568|这为我解决了这个问题。|154569|分析这个问题的另一个数据点:在10.10中，似乎存在PATH环境变量的多个副本，并且subshell似乎更喜欢第二个副本。|154570|您可以通过在控制台上启动iTerm启动的任何cocoa应用程序来重现此过程。您将收到如下所示的警告：|154571|2014-06-04+19:23:09.859+gitx[14676:362580]+***+-[NSProcessInfo+environment]:+Warning:+duplicate+definition+for+key+'PATH'+found+in+environment+--+subsequent+definitions+are+ignored.++The+first+definition+was+'(the+path+I+have+configured+in+my+shell)',+the+ignored+definition+is+'/usr/bin:/bin:/usr/sbin:/sbin'.|154572|我认为这是10.10中的一个问题，而不是iTerm，但是iTerm正在做的一些事情导致了它的出现(这在Terminal.app中不会发生)|154573|更新：这是因为iTerm对环境做了一些“有趣”的事情。更新到iTerm+2.0的官方版本，以解决此问题。|offset|length|style|BOLD|154574|entityMap^0|0|0|0|0|0|0|0|0|2|0^^$0|@$1|2|3|4|5|6|7|Y|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|Z|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|10|8|@]|9|@]|A|$]]|$1|I|3|J|5|6|7|11|8|@]|9|@]|A|$]]|$1|K|3|L|5|6|7|12|8|@]|9|@]|A|$]]|$1|M|3|N|5|D|7|13|8|@]|9|@]|A|$E|F]]|$1|O|3|P|5|6|7|14|8|@]|9|@]|A|$]]|$1|Q|3|R|5|6|7|15|8|@$S|16|T|17|U|V]]|9|@]|A|$]]|$1|W|3|-4|5|6|7|18|8|@]|9|@]|A|$]]]|X|$]]

I think the cleanest solution for this for now is to change the initial command in your iTerm session to be

<pre><code>/usr/bin/login -f &lt;your user name&gt;
</code></pre>

This fixes the issue for me.

A further data point for analysis of the issue: It seems that in 10.10, multiple copies of the PATH environment variable exist and subshells seem to prefer the second copy. 

You can reproduce this by launching any cocoa application on the console as launched by iTerm. You'll get a warning that looks like this:

<pre><code>2014-06-04 19:23:09.859 gitx[14676:362580] *** -[NSProcessInfo environment]: Warning: duplicate definition for key 'PATH' found in environment -- subsequent definitions are ignored. The first definition was '(the path I have configured in my shell)', the ignored definition is '/usr/bin:/bin:/usr/sbin:/sbin'.
</code></pre>

I believe this to be a problem in 10.10 and not iTerm, but something iTerm is doing is causing it to manifest itself (this doesn't happen in Terminal.app)

Update: This is caused by iTerm doing "interesting" stuff to the environment. Update to the official release of iTerm 2.0 to make this problem go away.

blocks|key|155825|text|另一个解决方案是修改您的iTerm2|type|unstyled|depth|inlineStyleRanges|entityRanges|data|155826|cd+/Applications/iTerm.app/Contents/MacOS
mv+iTerm+iTerm-bin

cat+>+iTerm+<<EOF
#!/bin/sh
unset+PATH
\${0}-bin
EOF

chmod+%2Bx+iTerm|code-block|syntax|javascript|155827|好了。|155828|与优胜美地一起享受你的iTerm2吧！|155829|entityMap^0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|M|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|N|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|O|8|@]|9|@]|A|$]]|$1|I|3|J|5|6|7|P|8|@]|9|@]|A|$]]|$1|K|3|-4|5|6|7|Q|8|@]|9|@]|A|$]]]|L|$]]

Another solution, modify your iTerm2 

<pre><code>cd /Applications/iTerm.app/Contents/MacOS
mv iTerm iTerm-bin

cat &gt; iTerm &lt;&lt;EOF
#!/bin/sh
unset PATH
\${0}-bin
EOF

chmod +x iTerm
</code></pre>

Done.

Enjoy your iTerm2 with Yosemite!

blocks|key|154598|text|编辑git-pull文件，并将该行添加到它的顶部(就在注释块之后)|type|unstyled|depth|inlineStyleRanges|entityRanges|data|154599|PATH="$(dirname+$0):$PATH"|code-block|syntax|javascript|154600|或者直接复制粘贴到你的终端中：|154601|ed+-s+$(which+git-pull)+<<<+$'6i\nPATH="$(dirname+$0):$PATH"\n.\nwq'|154602|更新：根据pilif的假设，自上次iTerm2更新(1.0.0.20140629)以来，git-pull在没有此PATH覆盖的情况下正常运行。|offset|length|style|BOLD|CODE|154603|entityMap|0|LINK|mutability|MUTABLE|url|https://stackoverflow.com/questions/24022582/osx-10-10-yosemite-beta-on-git-pull-git-sh-setup-no-such-file-or-directory/24051529#24051529^0|0|0|0|0|0|3|18|8|1K|4|5|5|0|0^^$0|@$1|2|3|4|5|6|7|Z|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|10|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|11|8|@]|9|@]|A|$]]|$1|I|3|J|5|D|7|12|8|@]|9|@]|A|$E|F]]|$1|K|3|L|5|6|7|13|8|@$M|14|N|15|O|P]|$M|16|N|17|O|Q]|$M|18|N|19|O|Q]]|9|@$M|1A|N|1B|1|1C]]|A|$]]|$1|R|3|-4|5|6|7|1D|8|@]|9|@]|A|$]]]|S|$T|$5|U|V|W|A|$X|Y]]]]

Edit your git-pull file and add this line on top of it (just after the comment block)

<pre><code>PATH="$(dirname $0):$PATH"
</code></pre>

Or just copy paste this in your terminal :

<pre><code>ed -s $(which git-pull) &lt;&lt;&lt; $'6i\nPATH="$(dirname $0):$PATH"\n.\nwq'
</code></pre>

Update: As presumed by <a href="https://stackoverflow.com/questions/24022582/osx-10-10-yosemite-beta-on-git-pull-git-sh-setup-no-such-file-or-directory/24051529#24051529">pilif</a>, since last iTerm2 update (1.0.0.20140629), <code>git-pull</code> run properly without this <code>PATH</code> override.

blocks|key|2953903|text|下载最新版本的iTerm2为我修复了这个问题！|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2953904|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|D|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|E|8|@]|9|@]|A|$]]]|C|$]]

Downloading the newest version of iTerm2 fixed this for me!

blocks|key|155865|text|git-rebase.sh有一个更新|type|unstyled|depth|inlineStyleRanges|entityRanges|data|155866|https://github.com/git/git/pull/110/files|offset|length|155867|entityMap|0|LINK|mutability|MUTABLE|url^0|0|0|15|0|0^^$0|@$1|2|3|4|5|6|7|M|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|N|8|@]|9|@$D|O|E|P|1|Q]]|A|$]]|$1|F|3|-4|5|6|7|R|8|@]|9|@]|A|$]]]|G|$H|$5|I|J|K|A|$L|C]]]]

There is an update to git-rebase.sh

<a href="https://github.com/git/git/pull/110/files" rel="nofollow">https://github.com/git/git/pull/110/files</a>

After upgrading to OSX 10.10 Yosemite Beta, running <code>git pull</code> is returning the following error:

<blockquote>
 /Library/Developer/CommandLineTools/usr/libexec/git-core/git-pull: line 11: git-sh-setup: No such file or directory
</blockquote>

I've checked the referenced git-core directory and the git-sh-setup.sh is there.

Other git commands are working exactly as expected

OSX 10.10 yosemite beta on git pull: git-sh-setup: No such file or directory

MacOS

升级到OSX 10.10 Yosemite Beta后，运行git pull返回以下错误：设置/Library/Developer/CommandLineTools/usr/libexec/git-core/git-pull:第11行:git-sh- ：没有这样的文件或目录我检查了引用的git-core目录，git-s...

问OSX 10.10 yosemite beta on git pull: git-sh-setup:没有这样的文件或目录
EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问OSX 10.10 yosemite beta on git pull: git-sh-setup:没有这样的文件或目录EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问OSX 10.10 yosemite beta on git pull: git-sh-setup:没有这样的文件或目录
EN