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

Merge pull request #1 from pre-commit/barry-pr-277

Browse source 
Fixups and test for pre-commit/pre-commit#277
This commit is contained in:
Barry Steyn 2015-10-08 19:15:36 -07:00
commit 354c02b0c1
4 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
pre_commit/commands/install_uninstall.py
View file

@ -21,10 +21,11 @@ PREVIOUS_IDENTIFYING_HASHES = (
'd8ee923c46731b42cd95cc869add4062', 'd8ee923c46731b42cd95cc869add4062',
'49fd668cb42069aa1b6048464be5d395', '49fd668cb42069aa1b6048464be5d395',
'79f09a650522a87b0da915d0d983b2de', '79f09a650522a87b0da915d0d983b2de',
'e358c9dae00eac5d06b38dfdb1e33a8c',
) )
IDENTIFYING_HASH = 'e358c9dae00eac5d06b38dfdb1e33a8c' IDENTIFYING_HASH = '138fd403232d2ddd5efb44317e38bf03'
def is_our_pre_commit(filename): def is_our_pre_commit(filename):

2
pre_commit/resources/hook-tmpl
View file

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# This is a randomish md5 to identify this script # This is a randomish md5 to identify this script
# e358c9dae00eac5d06b38dfdb1e33a8c # 138fd403232d2ddd5efb44317e38bf03
pushd `dirname $0` > /dev/null pushd `dirname $0` > /dev/null
HERE=`pwd` HERE=`pwd`

2
pre_commit/resources/pre-push-tmpl
View file

@ -11,7 +11,7 @@ do
fi fi
done done
if [ "args" != "" ]; then if [ "$args" != "" ]; then
args="$args --hook-stage push" args="$args --hook-stage push"
else else
# If args is empty, then an attempt to push on an empty # If args is empty, then an attempt to push on an empty

12
tests/commands/install_uninstall_test.py
View file

@ -472,3 +472,15 @@ def test_pre_push_integration_accepted(tempdir_factory):
assert retc == 0 assert retc == 0
assert 'Bash hook' in output assert 'Bash hook' in output
assert 'Passed' in output assert 'Passed' in output
def test_pre_push_integration_empty_push(tempdir_factory):
upstream = make_consuming_repo(tempdir_factory, 'script_hooks_repo')
path = tempdir_factory.get()
cmd_output('git', 'clone', upstream, path)
with cwd(path):
install(Runner(path), hook_type='pre-push')
_get_push_output(tempdir_factory)
retc, output = _get_push_output(tempdir_factory)
assert output == 'Everything up-to-date\n'
assert retc == 0