Commit8df6b87

Darragh Bailey

committed

Copy environment for subprocess execution

Git utilizes multiple environment variables to control variousbehaviours. Make sure to set LC_MESSAGES on a copy of the environmentinstead of discarding any variables that may be set by the user ordefault shell environment such as EDITOR.Add test to assert that when overriding GIT_EDITOR via os.environ thatthe modified value will be picked up by and git commands called.

1 parent2af9892 commit8df6b87Copy full SHA for 8df6b87

File tree

2 files changed

-1

lines changed

git
- cmd.py
- test
  - test_git.py

2 files changed

-1

lines changed

`‎git/cmd.py`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -341,8 +341,10 @@ def execute(self, command,`
`341`	`341`	`cwd=self._working_dir`
`342`	`342`
`343`	`343`	`# Start the process`
	`344`	`+env=os.environ.copy()`
	`345`	`+env["LC_MESSAGES"]="C"`
`344`	`346`	`proc=Popen(command,`
`345`		`-env={"LC_MESSAGES":"C"},`
	`347`	`+env=env,`
`346`	`348`	`cwd=cwd,`
`347`	`349`	`stdin=istream,`
`348`	`350`	`stderr=PIPE,`

`‎git/test/test_git.py`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`# the BSD License: http://www.opensource.org/licenses/bsd-license.php`
`6`	`6`
`7`	`7`	`importos`
	`8`	`+importmock`
`8`	`9`	`fromgit.test.libimport (TestBase,`
`9`	`10`	`patch,`
`10`	`11`	`raises,`
`@@ -128,3 +129,8 @@ def test_single_char_git_options_are_passed_to_git(self):`
`128`	`129`
`129`	`130`	`deftest_change_to_transform_kwargs_does_not_break_command_options(self):`
`130`	`131`	`self.git.log(n=1)`
	`132`	`+`
	`133`	`+deftest_env_vars_passed_to_git(self):`
	`134`	`+editor='non_existant_editor'`
	`135`	`+withmock.patch.dict('os.environ', {'GIT_EDITOR':editor}):`
	`136`	`+assertself.git.var("GIT_EDITOR")==editor`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit8df6b87

File tree

2 files changed

2 files changed

`‎git/cmd.py`

`‎git/test/test_git.py`

0 commit comments