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

Allow unstaged config when running against files or all-files. Resolves #242

Browse source
This commit is contained in:
Anthony Sottile 2015-06-15 11:25:58 -07:00
parent 25ebea63ea
commit 53cc2a64c9
2 changed files with 29 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pre_commit/commands/run.py
View file

@ -139,6 +139,7 @@ def _has_unstaged_config(runner):
def run(runner, args, write=sys_stdout_write_wrapper, environ=os.environ):
no_stash = args.no_stash or args.all_files or bool(args.files)
# Set up our logging handler
logger.addHandler(LoggingHandler(args.color, write=write))
logger.setLevel(logging.INFO)
@ -150,7 +151,7 @@ def run(runner, args, write=sys_stdout_write_wrapper, environ=os.environ):
if bool(args.source) != bool(args.origin):
logger.error('Specify both --origin and --source.')
return 1
if _has_unstaged_config(runner) and not args.no_stash:
if _has_unstaged_config(runner) and not no_stash:
if args.allow_unstaged_config:
logger.warn(
'You have an unstaged config file and have specified the '
@ -166,8 +167,7 @@ def run(runner, args, write=sys_stdout_write_wrapper, environ=os.environ):
)
return 1
# Don't stash if specified or files are specified
if args.no_stash or args.all_files or args.files:
if no_stash:
ctx = noop_context()
else:
ctx = staged_files_only(runner.cmd_runner)