From 4d4f9427d1e57fd7c3db68965e41d95d2b197339 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Rowlands=20=28=EB=B3=80=EA=B8=B0=ED=98=B8=29?=
 <peter@pmrowla.com>
Date: Wed, 31 Mar 2021 19:47:34 +0900
Subject: [PATCH] dvcignore: ignore file '.git' by default (#5745)

* dvcignore: ignore file '.git' by default

* update tests
---
 dvc/ignore.py             | 7 ++++++-
 tests/func/test_ignore.py | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/dvc/ignore.py b/dvc/ignore.py
index 8cccfecfe..cdb8722b8 100644
--- a/dvc/ignore.py
+++ b/dvc/ignore.py
@@ -183,7 +183,12 @@ class DvcIgnoreFilter:
     def __init__(self, fs, root_dir):
         from dvc.repo import Repo
 
-        default_ignore_patterns = [".hg/", ".git/", "{}/".format(Repo.DVC_DIR)]
+        default_ignore_patterns = [
+            ".hg/",
+            ".git/",
+            ".git",
+            "{}/".format(Repo.DVC_DIR),
+        ]
 
         self.fs = fs
         self.root_dir = root_dir
diff --git a/tests/func/test_ignore.py b/tests/func/test_ignore.py
index 65f806bcf..4da3bf777 100644
--- a/tests/func/test_ignore.py
+++ b/tests/func/test_ignore.py
@@ -112,7 +112,7 @@ def test_ignore_collecting_dvcignores(tmp_dir, dvc, dname):
     assert (
         DvcIgnorePatterns(
             *merge_patterns(
-                _to_pattern_info_list([".hg/", ".git/", ".dvc/"]),
+                _to_pattern_info_list([".hg/", ".git/", ".git", ".dvc/"]),
                 os.fspath(tmp_dir),
                 _to_pattern_info_list([os.path.basename(dname)]),
                 top_ignore_path,
@@ -344,7 +344,7 @@ def test_pattern_trie_fs(tmp_dir, dvc):
     )
 
     base_pattern = (
-        _to_pattern_info_list([".hg/", ".git/", ".dvc/"]),
+        _to_pattern_info_list([".hg/", ".git/", ".git", ".dvc/"]),
         os.fspath(tmp_dir),
     )
     first_pattern = merge_patterns(