Merge branch 'master' into add_sampler

ultralytics · Aug 1, 2022 · 9929f04 · 9929f04
2 parents 0201b44 + 7b9cc32
commit 9929f04
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,5 +1,5 @@
 # Repo-specific DockerIgnore -------------------------------------------------------------------------------------------
-#.git
+.git
 .cache
 .idea
 runs

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -15,9 +15,7 @@ repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.3.0
     hooks:
-      - id: no-commit-to-branch
-        args: ['--branch', 'master']
-      - id: end-of-file-fixer
+      # - id: end-of-file-fixer
       - id: trailing-whitespace
       - id: check-case-conflict
       - id: check-yaml

diff --git a/utils/general.py b/utils/general.py
@@ -316,7 +316,6 @@ def check_git_status(repo='ultralytics/yolov5'):
     msg = f', for updates see {url}'
     s = colorstr('github: ')  # string
     assert Path('.git').exists(), s + 'skipping check (not a git repository)' + msg
-    assert not is_docker(), s + 'skipping check (Docker image)' + msg
     assert check_online(), s + 'skipping check (offline)' + msg
 
     splits = re.split(pattern=r'\s', string=check_output('git remote -v', shell=True).decode())
-Original file line number
+Diff line change
@@ -1,5 +1,5 @@
     # Repo-specific DockerIgnore -------------------------------------------------------------------------------------------
-    #.git
+    .git
     .cache
     .idea
     runs
@@ Expand Down @@