mirror/pre-commit
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit.git synced 2026-01-15 13:30:17 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix (hopefully) bug where an empty patch was generated. Closes #76

Browse Source
This commit is contained in:
Anthony Sottile
2014-04-13 21:22:08 -07:00
parent 6d8621c09c
commit f94f56addf
2 changed files with 35 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pre_commit/staged_files_only.py
View File

@@ -17,11 +17,11 @@ def staged_files_only(cmd_runner):
cmd_runner - PrefixedCommandRunner
"""
# Determine if there are unstaged files
retcode, _, _ = cmd_runner.run(
['git', 'diff-files', '--quiet'],
retcode, diff_stdout, _ = cmd_runner.run(
['git', 'diff', '--ignore-submodules', '--binary', '--exit-code'],
retcode=None,
)
if retcode:
if retcode and diff_stdout.strip():
patch_filename = cmd_runner.path('patch{0}'.format(int(time.time())))
logger.warning('Unstaged files detected.')
logger.info(
@@ -29,7 +29,7 @@ def staged_files_only(cmd_runner):
)
# Save the current unstaged changes as a patch
with open(patch_filename, 'w') as patch_file:
cmd_runner.run(['git', 'diff', '--binary'], stdout=patch_file)
patch_file.write(diff_stdout)
# Clear the working directory of unstaged changes
cmd_runner.run(['git', 'checkout', '--', '.'])