| commit | 9c632ea29ccd58a9967690c2670edec31dc468cd | |
| author | Avery Pennarun <apenwarr@gmail.com> | |
| Thu, 24 Jun 2010 05:53:05 +0000 (24 01:53 -0400) | ||
| committer | Avery Pennarun <apenwarr@gmail.com> | |
| Thu, 24 Jun 2010 05:53:05 +0000 (24 01:53 -0400) | ||
| tree | c6b75245e4c216b2c427fbd60a3e5a1e54253f10 | treesnapshot (tar.gz zip) |
| parent | c00d1d11688dc02f066196ed18783effdb7767ab | commitdiff |
(Hopefully) fix PATH setting for msysgit.
Reported by Evan Shaw. The problem is that $(git --exec-path) includes a
'git' binary which is incompatible with the one in /usr/bin; if you run it,
it gives you an error about libiconv2.dll.
You might think we could just add $(git --exec-path) at the *end* of PATH,
but then if there are multiple versions of git installed, we could end up
with the wrong one; earlier versions used to put git-sh-setup in /usr/bin,
so we'd pick up that one before the new one.
So now we just set PATH back to its original value right after running
git-sh-setup, and we should be okay.
Reported by Evan Shaw. The problem is that $(git --exec-path) includes a
'git' binary which is incompatible with the one in /usr/bin; if you run it,
it gives you an error about libiconv2.dll.
You might think we could just add $(git --exec-path) at the *end* of PATH,
but then if there are multiple versions of git installed, we could end up
with the wrong one; earlier versions used to put git-sh-setup in /usr/bin,
so we'd pick up that one before the new one.
So now we just set PATH back to its original value right after running
git-sh-setup, and we should be okay.
| git-subtree.sh | diffblobblamehistory |