Sitelet https://github.com/actions/checkout/pull/2580/files
Skip to content

compare an explicit patch of zero against the minimum version #2580

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

Open
AuroraAeon wants to merge 1 commit into
base: main
Choose a base branch
from
Open

compare an explicit patch of zero against the minimum version #2580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 25 additions & 0 deletions __test__/git-version.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,31 @@ describe('git-version tests', () => {
expect(version.checkMinimum(new GitVersion('5.1.2'))).toBeFalsy()
})

it('compares an explicit patch of zero', async () => {
// A patch component of zero must be compared, not treated as unspecified
// (0 is falsy). A patch left unspecified by a two-part version such as
// "2.28" is treated as satisfying any patch of that minor version.
expect(
new GitVersion('4.5.0').checkMinimum(new GitVersion('4.5.1'))
).toBeFalsy()
expect(
new GitVersion('2.28.0').checkMinimum(new GitVersion('2.28.1'))
).toBeFalsy()
expect(
new GitVersion('4.5.0').checkMinimum(new GitVersion('4.5.0'))
).toBeTruthy()
expect(
new GitVersion('4.5.0').checkMinimum(new GitVersion('4.5'))
).toBeTruthy()
expect(
new GitVersion('4.5.1').checkMinimum(new GitVersion('4.5.0'))
).toBeTruthy()
// Unspecified patch satisfies any patch of the same minor version
expect(
new GitVersion('4.5').checkMinimum(new GitVersion('4.5.0'))
).toBeTruthy()
})

it('sparse checkout', async () => {
const minSparseVer = MinimumGitSparseCheckoutVersion
expect(new GitVersion('1.0').checkMinimum(minSparseVer)).toBeFalsy()
Expand Down
8 changes: 6 additions & 2 deletions dist/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35553,8 +35553,12 @@ class GitVersion {
}
// Minor is equal
if (this.minor === minimum.minor) {
// Patch is insufficient
if (this.patch && this.patch < (minimum.patch || 0)) {
// Patch is insufficient. The patch component is only compared when it
// was explicitly specified: an instance built from a two-part version
// (e.g. "2.28") leaves patch as NaN, which is treated as satisfying any
// patch of that minor version. An explicit zero must not be mistaken for
// an unspecified value, because 0 is falsy.
if (!Number.isNaN(this.patch) && this.patch < (minimum.patch || 0)) {
return false;
}
}
Expand Down
8 changes: 6 additions & 2 deletions src/git-version.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,12 @@ export class GitVersion {

// Minor is equal
if (this.minor === minimum.minor) {
// Patch is insufficient
if (this.patch && this.patch < (minimum.patch || 0)) {
// Patch is insufficient. The patch component is only compared when it
// was explicitly specified: an instance built from a two-part version
// (e.g. "2.28") leaves patch as NaN, which is treated as satisfying any
// patch of that minor version. An explicit zero must not be mistaken for
// an unspecified value, because 0 is falsy.
if (!Number.isNaN(this.patch) && this.patch < (minimum.patch || 0)) {
return false
}
}
Expand Down