Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions fuzz/in/modern_git_version.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
TASK-42releaseygit version 2.50.1.windows.1
1 change: 1 addition & 0 deletions fuzz/in/old_git_version.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
TASK-42releaseygit version 2.11.0
13 changes: 12 additions & 1 deletion lib/GitOld.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,24 @@ module.exports = class OldGit {
this.gitRepo = o.gitRepo
}

static isVersionAtLeast (version, minVersion) {
if (!version) return true
const cleaned = version.trim()
if (!cleaned) return true
const [vMajor, vMinor] = cleaned.split('.').map(n => parseInt(n, 10))
const [minMajor, minMinor] = minVersion.split('.').map(n => parseInt(n, 10))
if (vMajor > minMajor) return true
if (vMajor < minMajor) return false
return vMinor >= minMinor
}

async translate (o) {
if (!o.version) {
let v = await ShellCommand.withText (`git --version`).runSilent ()
o.version = v.split ('git version')[1]
}

if (o.version > '2.23') {
if (OldGit.isVersionAtLeast (o.version, '2.23')) {
return o
}

Expand Down
26 changes: 26 additions & 0 deletions tests/GitOld.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,30 @@ describe('git old', () => {
{todo: asIs, version}
)
})

describe('isVersionAtLeast', () => {
it ('should handle leading space (real git output)', (t) => {
assert.strictEqual(GitOld.isVersionAtLeast(' 2.50.1.windows.1', '2.23'), true)
assert.strictEqual(GitOld.isVersionAtLeast(' 2.40.0', '2.23'), true)
})

it ('should compare versions correctly', (t) => {
assert.strictEqual(GitOld.isVersionAtLeast('2.50.1', '2.23'), true)
assert.strictEqual(GitOld.isVersionAtLeast('2.24.1', '2.23'), true)
assert.strictEqual(GitOld.isVersionAtLeast('2.23.0', '2.23'), true)
assert.strictEqual(GitOld.isVersionAtLeast('2.22.0', '2.23'), false)
assert.strictEqual(GitOld.isVersionAtLeast('2.11.0', '2.23'), false)
})

it ('should handle major version differences', (t) => {
assert.strictEqual(GitOld.isVersionAtLeast('3.0.0', '2.23'), true)
assert.strictEqual(GitOld.isVersionAtLeast('1.99.0', '2.23'), false)
})

it ('should return true for undefined/null (assume modern git)', (t) => {
assert.strictEqual(GitOld.isVersionAtLeast(undefined, '2.23'), true)
assert.strictEqual(GitOld.isVersionAtLeast(null, '2.23'), true)
assert.strictEqual(GitOld.isVersionAtLeast('', '2.23'), true)
})
})
})