From bbbfb7f8e2c9e3097a4eab5913cc87072793b15c Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Tue, 21 Sep 2021 10:53:05 +0200 Subject: [PATCH 1/3] Bump dugite-native to v2.32.0-1 --- script/embedded-git.json | 30 +++++++++++++++--------------- test/helpers.ts | 6 +++--- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/script/embedded-git.json b/script/embedded-git.json index 848efb8b..7cacf37a 100644 --- a/script/embedded-git.json +++ b/script/embedded-git.json @@ -1,27 +1,27 @@ { "win32-x64": { - "name": "dugite-native-v2.29.3-3d467be-windows-x64.tar.gz", - "url": "https://github.com/desktop/dugite-native/releases/download/v2.29.3-2/dugite-native-v2.29.3-3d467be-windows-x64.tar.gz", - "checksum": "8ea2d0d3c9d9e4615069913207371ffe892dc10fb93975972f2f6e668f2e3b3a" + "name": "dugite-native-v2.32.0-e5e7a87-windows-x64.tar.gz", + "url": "https://github.com/desktop/dugite-native/releases/download/v2.32.0-1/dugite-native-v2.32.0-e5e7a87-windows-x64.tar.gz", + "checksum": "4d5247c6a837f4280cb4e5bd77d0a17cfc3b4aa000c8f5feaf94a99c6b997374" }, "win32-ia32": { - "name": "dugite-native-v2.29.3-3d467be-windows-x86.tar.gz", - "url": "https://github.com/desktop/dugite-native/releases/download/v2.29.3-2/dugite-native-v2.29.3-3d467be-windows-x86.tar.gz", - "checksum": "d3ed6c82be7302fa7ed7e378ba902afc49b9a3c157cc6816ad4c80da26675c8d" + "name": "dugite-native-v2.32.0-e5e7a87-windows-x86.tar.gz", + "url": "https://github.com/desktop/dugite-native/releases/download/v2.32.0-1/dugite-native-v2.32.0-e5e7a87-windows-x86.tar.gz", + "checksum": "3588a76e84f6658d0598f087f6fa7ae882fb0fd61c59a0ccbb8a613c490f3b4f" }, "darwin-x64": { - "name": "dugite-native-v2.29.3-3d467be-macOS-x64.tar.gz", - "url": "https://github.com/desktop/dugite-native/releases/download/v2.29.3-2/dugite-native-v2.29.3-3d467be-macOS-x64.tar.gz", - "checksum": "726bf34cf449de7b74d2fa45f05ed76df650a4cd23e44ab80c92e3b939832fe2" + "name": "dugite-native-v2.32.0-e5e7a87-macOS-x64.tar.gz", + "url": "https://github.com/desktop/dugite-native/releases/download/v2.32.0-1/dugite-native-v2.32.0-e5e7a87-macOS-x64.tar.gz", + "checksum": "488cbc7e8f294d073b486a0f9839d3fbcc82c5c56b0bca825bb60d12c19b04b9" }, "darwin-arm64": { - "name": "dugite-native-v2.29.3-3d467be-macOS-arm64.tar.gz", - "url": "https://github.com/desktop/dugite-native/releases/download/v2.29.3-2/dugite-native-v2.29.3-3d467be-macOS-arm64.tar.gz", - "checksum": "b04a63b0fdd6d492c2498b8dc5d6b47f8826702f582614f2e9221d8f16d23e11" + "name": "dugite-native-v2.32.0-e5e7a87-macOS-arm64.tar.gz", + "url": "https://github.com/desktop/dugite-native/releases/download/v2.32.0-1/dugite-native-v2.32.0-e5e7a87-macOS-arm64.tar.gz", + "checksum": "d1f67b13417d2e335349ff917877d420778b0b1621ff8f85163379dcff5f0338" }, "linux-x64": { - "name": "dugite-native-v2.29.3-3d467be-ubuntu.tar.gz", - "url": "https://github.com/desktop/dugite-native/releases/download/v2.29.3-2/dugite-native-v2.29.3-3d467be-ubuntu.tar.gz", - "checksum": "288d3b64dd9c7ecd73e289bf622ce226dc7b832f1b42cddecc039d0d3fd16b32" + "name": "dugite-native-v2.32.0-e5e7a87-ubuntu.tar.gz", + "url": "https://github.com/desktop/dugite-native/releases/download/v2.32.0-1/dugite-native-v2.32.0-e5e7a87-ubuntu.tar.gz", + "checksum": "d1bec4d9618b009e46c023ff4d03cdf8da3ce0419536cecf72e05e5bb350bc0d" } } \ No newline at end of file diff --git a/test/helpers.ts b/test/helpers.ts index 0d1ee2d0..0e748bda 100644 --- a/test/helpers.ts +++ b/test/helpers.ts @@ -1,9 +1,9 @@ import { GitProcess, IGitResult, GitError } from '../lib' // NOTE: bump these versions to the latest stable releases -export const gitVersion = '2.29.3' -export const gitForWindowsVersion = '2.29.2.windows.4' -export const gitLfsVersion = '2.13.2' +export const gitVersion = '2.32.0' +export const gitForWindowsVersion = '2.32.0.windows.2' +export const gitLfsVersion = '2.13.3' const temp = require('temp').track() From b514bbb2b6da791a6610fb8b1e9a77425dfa2f26 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Tue, 21 Sep 2021 10:57:23 +0200 Subject: [PATCH 2/3] Update error string for `RemoteAlreadyExists` --- lib/errors.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/errors.ts b/lib/errors.ts index 59cb425e..65dbcd96 100644 --- a/lib/errors.ts +++ b/lib/errors.ts @@ -139,7 +139,7 @@ export const GitErrorRegexes: { [regexp: string]: GitError } = { GitError.ProtectedBranchRequiredStatus, 'error: GH007: Your push would publish a private email address.': GitError.PushWithPrivateEmail, 'error: could not lock config file (.+): File exists': GitError.ConfigLockFileAlreadyExists, - 'fatal: remote (.+) already exists.': GitError.RemoteAlreadyExists, + 'error: remote (.+) already exists.': GitError.RemoteAlreadyExists, "fatal: tag '(.+)' already exists": GitError.TagAlreadyExists, 'error: Your local changes to the following files would be overwritten by merge:\n': GitError.MergeWithLocalChanges, From ec2a189722336cd62a2ca3a8f3f70ac0634cb6f7 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Tue, 21 Sep 2021 11:00:10 +0200 Subject: [PATCH 3/3] 1.104.0 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 636a32e4..57d69439 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "dugite", - "version": "1.103.0", + "version": "1.104.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 322fed86..32f8b1fa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dugite", - "version": "1.103.0", + "version": "1.104.0", "description": "Elegant bindings for Git", "main": "./build/lib/index.js", "typings": "./build/lib/index.d.ts",