diff --git a/git/repo/base.py b/git/repo/base.py
index 723613c6f..ab2026549 100644
--- a/git/repo/base.py
+++ b/git/repo/base.py
@@ -600,7 +600,7 @@ def config_writer(self, config_level: Lit_config_levels = "repository") -> GitCo
system = system wide configuration file
global = user level configuration file
repository = configuration file for this repository only"""
- return GitConfigParser(self._get_config_path(config_level), read_only=False, repo=self)
+ return GitConfigParser(self._get_config_path(config_level), read_only=False, repo=self, merge_includes=False)
def commit(self, rev: Union[str, Commit_ish, None] = None) -> Commit:
"""The Commit object for the specified revision
diff --git a/test/test_refs.py b/test/test_refs.py
index 5bb83100e..4c421767e 100644
--- a/test/test_refs.py
+++ b/test/test_refs.py
@@ -15,6 +15,7 @@
SymbolicReference,
GitCommandError,
RefLog,
+ GitConfigParser,
)
from git.objects.tag import TagObject
from test.lib import TestBase, with_rw_repo
@@ -172,6 +173,26 @@ def test_heads(self, rwrepo):
assert log[0].oldhexsha == pcommit.NULL_HEX_SHA
assert log[0].newhexsha == pcommit.hexsha
+ @with_rw_repo("HEAD", bare=False)
+ def test_set_tracking_branch_with_import(self, rwrepo):
+ # prepare included config file
+ included_config = osp.join(rwrepo.git_dir, "config.include")
+ with GitConfigParser(included_config, read_only=False) as writer:
+ writer.set_value("test", "value", "test")
+ assert osp.exists(included_config)
+
+ with rwrepo.config_writer() as writer:
+ writer.set_value("include", "path", included_config)
+
+ for head in rwrepo.heads:
+ head.set_tracking_branch(None)
+ assert head.tracking_branch() is None
+ remote_ref = rwrepo.remotes[0].refs[0]
+ assert head.set_tracking_branch(remote_ref) is head
+ assert head.tracking_branch() == remote_ref
+ head.set_tracking_branch(None)
+ assert head.tracking_branch() is None
+
def test_refs(self):
types_found = set()
for ref in self.rorepo.refs:
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy