Skip to content

Choose a semver tag over the last tag in a repo #3732

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

Closed
pjaselin wants to merge 5 commits into from
+37 −1
Closed

Choose a semver tag over the last tag in a repo #3732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6278aaa
fix: getting the commit of the most recent tag, then getting the list…
pjaselin Aug 2, 2026
29776ce
test: adding test to check if the full tag (v1.1.1) is used instead o…
pjaselin Aug 2, 2026
c031f00
test: adding autoupdate test to cover where multiple tags are present…
pjaselin Aug 2, 2026
9308d56
Merge pull request #1 from pjaselin/fix/autoupdate-short-versions
pjaselin Aug 2, 2026
b88f42a
test: adding assertion to make sure tags are all returned in list
pjaselin Aug 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion pre_commit/git.py
View file
Open in desktop

@pjaselin pjaselin Aug 2, 2026

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Does NO_FS_MONITOR need to be in L240?

Original file line number Diff line number Diff line change
Expand Up @@ -236,8 +236,11 @@ def get_best_candidate_tag(rev: str, git_repo: str) -> str:
Multiple tags can exist on a SHA. Sometimes a moving tag is attached
to a version tag. Try to pick the tag that looks like a version.
"""
commit = cmd_output(
'git', 'rev-list', '-n', '1', rev, cwd=git_repo,
)[1].strip()
tags = cmd_output(
'git', *NO_FS_MONITOR, 'tag', '--points-at', rev, cwd=git_repo,
'git', *NO_FS_MONITOR, 'tag', '--points-at', commit, cwd=git_repo,
)[1].splitlines()
for tag in tags:
if '.' in tag:
Expand Down
18 changes: 18 additions & 0 deletions tests/commands/autoupdate_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,13 @@ def tagged(out_of_date):
yield out_of_date


@pytest.fixture
def multiple_tagged(out_of_date):
cmd_output('git', 'tag', 'v1', cwd=out_of_date.path)
cmd_output('git', 'tag', 'v1.2.3', cwd=out_of_date.path)
yield out_of_date


@pytest.fixture
def hook_disappearing(tempdir_factory):
path = make_repo(tempdir_factory, 'python_hooks_repo')
Expand Down Expand Up @@ -102,6 +109,17 @@ def test_rev_info_update_tags_only_does_not_pick_tip(tagged):
assert new_info.rev == 'v1.2.3'


def test_rev_info_update_tags_prefers_semver_tag(multiple_tagged):
git_commit(cwd=multiple_tagged.path)
config = make_config_from_repo(
multiple_tagged.path,
rev=multiple_tagged.original_rev,
)
info = RevInfo.from_config(config)
new_info = info.update(tags_only=True, freeze=False)
assert new_info.rev == 'v1.2.3'


def test_rev_info_update_tags_prefers_version_tag(tagged, out_of_date):
cmd_output('git', 'tag', 'latest', cwd=out_of_date.path)
config = make_config_from_repo(tagged.path, rev=tagged.original_rev)
Expand Down
15 changes: 15 additions & 0 deletions tests/git_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,3 +302,18 @@ def test_no_git_env():
def test_init_repo_no_hooks(tmpdir):
git.init_repo(str(tmpdir), remote='dne')
assert not tmpdir.join('.git/hooks').exists()


def test_get_best_candidate_tag(in_git_dir):
git_commit()
cmd_output('git', 'tag', 'v1')
cmd_output('git', 'tag', 'v1.0.1')
commit = cmd_output(
'git', 'rev-list', '-n', '1', 'v1', cwd=in_git_dir,
)[1].strip()
tags = cmd_output(
'git', *git.NO_FS_MONITOR, 'tag',
'--points-at', commit, cwd=in_git_dir,
)[1].splitlines()
assert tags == ['v1', 'v1.0.1']
assert git.get_best_candidate_tag('v1', in_git_dir) == 'v1.0.1'
Loading