Merge pull request #2169 from gitpython-developers/fix-config-assert

Byron · web-flow · commit 3e59876f8ea6 · 2026-07-12T14:55:36.000+02:00
Allow relative config paths with includes
diff --git a/git/config.py b/git/config.py
@@ -634,6 +634,8 @@ def read(self) -> None:  # type: ignore[override]
             files_to_read = list(self._file_or_files)
         # END ensure we have a copy of the paths to handle
 
+        files_to_read = [osp.abspath(path) if isinstance(path, (str, os.PathLike)) else path for path in files_to_read]
+
         seen = set(files_to_read)
         num_read_include_files = 0
         while files_to_read:
diff --git a/test/test_config.py b/test/test_config.py
@@ -310,6 +310,20 @@ def check_test_value(cr, value):
         with GitConfigParser(fpa, read_only=True) as cr:
             check_test_value(cr, tv)
 
+    @with_rw_directory
+    def test_config_relative_path_include(self, rw_dir):
+        included_path = osp.join(rw_dir, "included")
+        with GitConfigParser(included_path, read_only=False) as cw:
+            cw.set_value("included", "value", "included")
+
+        config_path = osp.join(rw_dir, "config")
+        with GitConfigParser(config_path, read_only=False) as cw:
+            cw.set_value("include", "path", "included")
+
+        relative_config_path = osp.relpath(config_path)
+        with GitConfigParser(relative_config_path, read_only=True) as cr:
+            assert cr.get_value("included", "value") == "included"
+
     @with_rw_directory
     def test_multiple_include_paths_with_same_key(self, rw_dir):
         """Test that multiple 'path' entries under [include] are all respected.
