diff --git a/lib/errors.ts b/lib/errors.ts index 0db9a25e..2bb84ed4 100644 --- a/lib/errors.ts +++ b/lib/errors.ts @@ -108,8 +108,8 @@ export const GitErrorRegexes: { [regexp: string]: GitError } = { 'fatal: refusing to merge unrelated histories': GitError.CannotMergeUnrelatedHistories, 'The .+ attribute should be .+ but is .+': GitError.LFSAttributeDoesNotMatch, 'fatal: Branch rename failed': GitError.BranchRenameFailed, - "fatal: Path '(.+)' does not exist .+": GitError.PathDoesNotExist, - "fatal: Invalid object name '(.+)'.": GitError.InvalidObjectName, + "fatal: path '(.+)' does not exist .+": GitError.PathDoesNotExist, + "fatal: invalid object name '(.+)'.": GitError.InvalidObjectName, "fatal: .+: '(.+)' is outside repository": GitError.OutsideRepository, 'Another git process seems to be running in this repository, e.g.': GitError.LockFileAlreadyExists, diff --git a/package-lock.json b/package-lock.json index 101ac5f4..f8b9aae5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "dugite", - "version": "1.88.7", + "version": "1.91.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 87f85338..32cefaac 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dugite", - "version": "1.88.7", + "version": "1.91.2", "description": "Elegant bindings for Git", "main": "./build/lib/index.js", "typings": "./build/lib/index.d.ts", diff --git a/script/embedded-git.json b/script/embedded-git.json index bc287aeb..aa1b4dea 100644 --- a/script/embedded-git.json +++ b/script/embedded-git.json @@ -1,22 +1,22 @@ { "win32-x64": { - "name": "dugite-native-v2.23.3-c6632a4-windows-x64.tar.gz", - "url": "https://github.com/desktop/dugite-native/releases/download/v2.23.3-1/dugite-native-v2.23.3-c6632a4-windows-x64.tar.gz", - "checksum": "0e6a736a1113a26ee03ec15dc0a6b43b8759c8f4d69eded6906fd642788d88f5" + "name": "dugite-native-v2.26.2-63eeb68-windows-x64.tar.gz", + "url": "https://github.com/desktop/dugite-native/releases/download/v2.26.2/dugite-native-v2.26.2-63eeb68-windows-x64.tar.gz", + "checksum": "13d1e73bd91948554419579a7f49f5a8ec574c1d53146091f9ee12dc66f4d0a8" }, "win32-ia32": { - "name": "dugite-native-v2.23.3-c6632a4-windows-x86.tar.gz", - "url": "https://github.com/desktop/dugite-native/releases/download/v2.23.3-1/dugite-native-v2.23.3-c6632a4-windows-x86.tar.gz", - "checksum": "b64f0ca5bd141a7c4f26545cec97430a74d0aad271ad44ebdc3c20a3b323fdc9" + "name": "dugite-native-v2.26.2-63eeb68-windows-x86.tar.gz", + "url": "https://github.com/desktop/dugite-native/releases/download/v2.26.2/dugite-native-v2.26.2-63eeb68-windows-x86.tar.gz", + "checksum": "fa461e090b44b1003c742a97a2796e886d85236a98752fa86035bbe82910f75f" }, "darwin-x64": { - "name": "dugite-native-v2.23.3-c6632a4-macOS.tar.gz", - "url": "https://github.com/desktop/dugite-native/releases/download/v2.23.3-1/dugite-native-v2.23.3-c6632a4-macOS.tar.gz", - "checksum": "2f7d7f3e045f8ebe38510f2fbb7fc71a8e55f4cd821b06a0ab2af1311396f307" + "name": "dugite-native-v2.26.2-63eeb68-macOS.tar.gz", + "url": "https://github.com/desktop/dugite-native/releases/download/v2.26.2/dugite-native-v2.26.2-63eeb68-macOS.tar.gz", + "checksum": "702e0f8c8c83bb1cc6f358a884ec1bc5dabaf0a478a4a50cc024b0c5d1c3d807" }, "linux-x64": { - "name": "dugite-native-v2.23.3-c6632a4-ubuntu.tar.gz", - "url": "https://github.com/desktop/dugite-native/releases/download/v2.23.3-1/dugite-native-v2.23.3-c6632a4-ubuntu.tar.gz", - "checksum": "24b214455789498a2ae371046e0d8a905fb8dc9cfe85965ea16e2742971af67c" + "name": "dugite-native-v2.26.2-63eeb68-ubuntu.tar.gz", + "url": "https://github.com/desktop/dugite-native/releases/download/v2.26.2/dugite-native-v2.26.2-63eeb68-ubuntu.tar.gz", + "checksum": "6b515e7eb744eb0f3edcef55d4cacd1e92eb4feae3a6078e27758c4735f230e1" } -} \ No newline at end of file +} diff --git a/test/fast/git-process-test.ts b/test/fast/git-process-test.ts index 03c7f873..aa55bec2 100644 --- a/test/fast/git-process-test.ts +++ b/test/fast/git-process-test.ts @@ -332,21 +332,21 @@ remote: http://github.com/settings/emails` it('can parse path does not exist error - neither on disk nor in the index', () => { const stderr = - "fatal: Path 'missing.txt' does not exist (neither on disk nor in the index).\n" + "fatal: path 'missing.txt' does not exist (neither on disk nor in the index).\n" const error = GitProcess.parseError(stderr) expect(error).toBe(GitError.PathDoesNotExist) }) it('can parse path does not exist error - in commitish', () => { - const stderr = "fatal: Path 'missing.txt' does not exist in 'HEAD'\n" + const stderr = "fatal: path 'missing.txt' does not exist in 'HEAD'\n" const error = GitProcess.parseError(stderr) expect(error).toBe(GitError.PathDoesNotExist) }) it('can parse invalid object name error', () => { - const stderr = "fatal: Invalid object name 'HEAD'.\n" + const stderr = "fatal: invalid object name 'HEAD'.\n" const error = GitProcess.parseError(stderr) expect(error).toBe(GitError.InvalidObjectName) diff --git a/test/helpers.ts b/test/helpers.ts index 7f42d716..31d4ffa5 100644 --- a/test/helpers.ts +++ b/test/helpers.ts @@ -1,7 +1,7 @@ import { GitProcess, IGitResult } from '../lib' // NOTE: bump these versions to the latest stable releases -export const gitVersion = '2.23.' +export const gitVersion = '2.26.' export const gitLfsVersion = '2.7.2' const temp = require('temp').track()