FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

feat: Add support for hasconfig git rule. by bvanelli · Pull Request #2075 · gitpython-developers/GitPython · GitHub

  1. gitpython-developers
  2. GitPython

Repository navigation

feat: Add support for hasconfig git rule. #2075

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Byron merged 2 commits into from
Oct 8, 2025
Conversation 4 Commits 2 Checks 27 Files changed
Merged

feat: Add support for hasconfig git rule. #2075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bcdcccd
feat: Add support for hasconfig git rule.
bvanelli Oct 7, 2025
6cf8633
fix: Use fnmatch instead.
bvanelli Oct 7, 2025
File filter

Filter by extension

Filter by extension .py  (2) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
8 changes: 6 additions & 2 deletions git/config.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
CONFIG_LEVELS: ConfigLevels_Tup = ("system", "user", "global", "repository")
"""The configuration level of a configuration file."""

CONDITIONAL_INCLUDE_REGEXP = re.compile(r"(?<=includeIf )\"(gitdir|gitdir/i|onbranch):(.+)\"")
CONDITIONAL_INCLUDE_REGEXP = re.compile(r"(?<=includeIf )\"(gitdir|gitdir/i|onbranch|hasconfig:remote\.\*\.url):(.+)\"")
"""Section pattern to detect conditional includes.

See: https://git-scm.com/docs/git-config#_conditional_includes
Expand Down Expand Up @@ -590,7 +590,11 @@ def _included_paths(self) -> List[Tuple[str, str]]:

if fnmatch.fnmatchcase(branch_name, value):
paths += self.items(section)

elif keyword == "hasconfig:remote.*.url":
for remote in self._repo.remotes:
if fnmatch.fnmatchcase(remote.url, value):

Byron Oct 8, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Using a case-sensitive search is correct here, Git does the same.
paths += self.items(section)
break
return paths

def read(self) -> None: # type: ignore[override]
Expand Down
35 changes: 35 additions & 0 deletions test/test_config.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,41 @@ def test_conditional_includes_from_branch_name_error(self, rw_dir):
assert not config._has_includes()
assert config._included_paths() == []

@with_rw_directory
def test_conditional_includes_remote_url(self, rw_dir):
# Initiate mocked repository.
repo = mock.Mock()
repo.remotes = [mock.Mock(url="https://github.com/foo/repo")]

# Initiate config files.
path1 = osp.join(rw_dir, "config1")
path2 = osp.join(rw_dir, "config2")
template = '[includeIf "hasconfig:remote.*.url:{}"]\n path={}\n'

# Ensure that config with hasconfig and full url is correct.
with open(path1, "w") as stream:
stream.write(template.format("https://github.com/foo/repo", path2))

with GitConfigParser(path1, repo=repo) as config:
assert config._has_includes()
assert config._included_paths() == [("path", path2)]

# Ensure that config with hasconfig and incorrect url is incorrect.
with open(path1, "w") as stream:
stream.write(template.format("incorrect", path2))

Byron Oct 8, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

I think that "incorrect" fails to communicate that this is a URL that simply doesn't match.
Maybe something for a follow-up.

with GitConfigParser(path1, repo=repo) as config:
assert not config._has_includes()
assert config._included_paths() == []

# Ensure that config with hasconfig and url using glob pattern is correct.
with open(path1, "w") as stream:
stream.write(template.format("**/**github.com*/**", path2))

with GitConfigParser(path1, repo=repo) as config:
assert config._has_includes()
assert config._included_paths() == [("path", path2)]

def test_rename(self):
file_obj = self._to_memcache(fixture_path("git_config"))
with GitConfigParser(file_obj, read_only=False, merge_includes=False) as cw:
Expand Down
Loading
Back | FazBrowse Home | New Git URL