From 9dda6bd32caf3148b01e13a1528ba3fb63f57e61 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: Mon, 24 May 2021 17:40:14 +0900
Subject: [PATCH] git: update dulwich to 0.20.22 (#6049)

* git: update dulwich to 0.20.22

* git: disable reading system config in CI
---
 setup.py          | 2 +-
 tests/conftest.py | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index d885e09e0..1ecb0a284 100644
--- a/setup.py
+++ b/setup.py
@@ -51,7 +51,7 @@ install_requires = [
     "colorama>=0.3.9",
     "configobj>=5.0.6",
     "gitpython>3",
-    "dulwich>=0.20.21",
+    "dulwich>=0.20.22",
     "pygit2>=1.5.0",
     "setuptools>=34.0.0",
     "nanotime>=0.5.2",
diff --git a/tests/conftest.py b/tests/conftest.py
index ceaee1a20..cc160688f 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -10,6 +10,8 @@ from .remotes import *  # noqa, pylint: disable=wildcard-import
 os.environ["DVC_TEST"] = "true"
 # Ensure progress output even when not outputting to raw sys.stderr console
 os.environ["DVC_IGNORE_ISATTY"] = "true"
+# Disable system git config
+os.environ["GIT_CONFIG_NOSYSTEM"] = "1"
 
 REMOTES = {
     # remote: enabled_by_default?