Stone_Red/dvc
1
0
Fork 0
mirror of https://github.com/Stone-Red-Code/dvc.git synced 2026-11-02 07:18:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

dvc: hooks only act in branches where dvc active (#2338)

Browse Source 
* dvc: hooks only act in branches where dvc active

In a branch where DVC hasn't been initialized (as detected by
`git ls-files .dvc` not listing any files), don't invoke dvc in the git hooks.
This avoids trouble when switching between branches with and without dvc
initialized.

Fixes #2208

* dvc: simplify hooks per PR comment
This commit is contained in:
Gunnlaugur Thor Briem
2019-07-29 16:26:49 +03:00
committed by Ruslan Kuprieiev
parent df0359fad0
commit e917ce0ae8
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/func/test_install.py
+9 -2
View File
@@ -36,7 +36,11 @@ class TestInstall(object):
assert main(["install"]) == 0
expected_script = "#!/bin/sh\n" "echo hello\n" "exec dvc checkout\n"
expected_script = (
"#!/bin/sh\n"
"echo hello\n"
'[ -z "$(git ls-files .dvc)" ] || exec dvc checkout\n'
)
with open(self._hook("post-checkout"), "r") as fobj:
assert fobj.read() == expected_script
@@ -45,7 +49,10 @@ class TestInstall(object):
assert main(["install"]) == 0
assert main(["install"]) == 0
expected_script = "#!/bin/sh\n" "exec dvc checkout\n"
expected_script = (
"#!/bin/sh\n"
'[ -z "$(git ls-files .dvc)" ] || exec dvc checkout\n'
)
with open(self._hook("post-checkout"), "r") as fobj:
assert fobj.read() == expected_script