Skip to content

Support pre-commit install inside a worktree #809

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asottile merged 1 commit into from
Aug 6, 2018
Merged

Support pre-commit install inside a worktree #809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions pre_commit/git.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,16 @@ def get_root():


def get_git_dir(git_root):
return os.path.normpath(os.path.join(
git_root,
cmd_output('git', 'rev-parse', '--git-dir', cwd=git_root)[1].strip(),
))
def _git_dir(opt):
return os.path.normpath(os.path.join(
git_root,
cmd_output('git', 'rev-parse', opt, cwd=git_root)[1].strip(),
))

try:
return _git_dir('--git-common-dir')
except CalledProcessError: # pragma: no cover (git < 2.5)
Copy link

@Heier2013 Heier2013 Aug 20, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider compatibility git < 2.5?

Copy link
Member Author

@asottile asottile Aug 20, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you seeing issues with git < 2.5? This branch is intended to allow that to work?

return _git_dir('--git-dir')


def get_remote_url(git_root):
Expand Down
13 changes: 13 additions & 0 deletions tests/commands/install_uninstall_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,19 @@ def test_install_in_submodule_and_run(tempdir_factory, store):
assert NORMAL_PRE_COMMIT_RUN.match(output)


def test_install_in_worktree_and_run(tempdir_factory, store):
src_path = make_consuming_repo(tempdir_factory, 'script_hooks_repo')
path = tempdir_factory.get()
cmd_output('git', '-C', src_path, 'branch', '-m', 'notmaster')
cmd_output('git', '-C', src_path, 'worktree', 'add', path, '-b', 'master')

with cwd(path):
assert install(Runner(path, C.CONFIG_FILE), store) == 0
ret, output = _get_commit_output(tempdir_factory)
assert ret == 0
assert NORMAL_PRE_COMMIT_RUN.match(output)


def test_commit_am(tempdir_factory, store):
"""Regression test for #322."""
path = make_consuming_repo(tempdir_factory, 'script_hooks_repo')
Expand Down