third-party/pre-commit
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit.git synced 2026-02-18 00:24:47 +04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix #322 by only removing git environment variables while cloning

Browse source
This commit is contained in:
Anthony Sottile 2015-12-22 18:36:12 -08:00
parent c16479b94a
commit 495fefd316
6 changed files with 42 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

21
tests/commands/install_uninstall_test.py
View file

@ -133,7 +133,7 @@ def _get_commit_output(
home = home or tempdir_factory.get()
env = dict(env_base, PRE_COMMIT_HOME=home)
return cmd_output(
'git', 'commit', '-m', 'Commit!', '--allow-empty',
'git', 'commit', '-am', 'Commit!', '--allow-empty',
# git commit puts pre-commit to stderr
stderr=subprocess.STDOUT,
env=env,
@ -175,7 +175,7 @@ def test_install_in_submodule_and_run(tempdir_factory):
parent_path = git_dir(tempdir_factory)
with cwd(parent_path):
cmd_output('git', 'submodule', 'add', src_path, 'sub')
cmd_output('git', 'commit', '-am', 'foo')
cmd_output('git', 'commit', '-m', 'foo')
sub_pth = os.path.join(parent_path, 'sub')
with cwd(sub_pth):
@ -185,6 +185,23 @@ def test_install_in_submodule_and_run(tempdir_factory):
assert NORMAL_PRE_COMMIT_RUN.match(output)
def test_commit_am(tempdir_factory):
"""Regression test for #322."""
path = make_consuming_repo(tempdir_factory, 'script_hooks_repo')
with cwd(path):
# Make an unstaged change
open('unstaged', 'w').close()
cmd_output('git', 'add', '.')
cmd_output('git', 'commit', '-m', 'foo')
with io.open('unstaged', 'w') as foo_file:
foo_file.write('Oh hai')
assert install(Runner(path)) == 0
ret, output = _get_commit_output(tempdir_factory)
assert ret == 0
def test_install_idempotent(tempdir_factory):
path = make_consuming_repo(tempdir_factory, 'script_hooks_repo')
with cwd(path):

2
tests/repository_test.py
View file

@ -377,6 +377,7 @@ def test_additional_dependencies_roll_forward(tempdir_factory, store):
assert 'mccabe' in output
@skipif_slowtests_false
@xfailif_windows_no_ruby
@pytest.mark.integration
def test_additional_ruby_dependencies_installed(
@ -392,6 +393,7 @@ def test_additional_ruby_dependencies_installed(
assert 'thread_safe' in output
@skipif_slowtests_false
@xfailif_windows_no_node
@pytest.mark.integration
def test_additional_node_dependencies_installed(