Skip to content

Commit 0115c69

Browse files
committed
Merge pull request #373 from bcomnes/master
Work around for OSX 10.10 PATH issues
2 parents 64ec693 + f5269ee commit 0115c69

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

git.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,8 @@ def run(self):
118118
proc = subprocess.Popen(self.command,
119119
stdout=self.stdout, stderr=subprocess.STDOUT,
120120
stdin=subprocess.PIPE,
121-
shell=shell, universal_newlines=True)
121+
shell=shell, universal_newlines=True,
122+
env=os.environ)
122123
output = proc.communicate(self.stdin)[0]
123124
if not output:
124125
output = ''
@@ -346,4 +347,4 @@ def run(self, edit):
346347
class GitGitkThisFileCommand(GitTextCommand):
347348
def run(self, edit):
348349
command = ['gitk', self.get_file_name()]
349-
self.run_command(command)
350+
self.run_command(command)

0 commit comments

Comments
 (0)