From e0a406f596a54e8fe9deb356544f9a40c2d3074b Mon Sep 17 00:00:00 2001 From: Brendan Forster Date: Mon, 17 Dec 2018 10:01:04 -0400 Subject: [PATCH 1/2] update embedded Git to 2.20.1 --- script/embedded-git.json | 30 +++++++++++++++--------------- test/helpers.ts | 4 ++-- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/script/embedded-git.json b/script/embedded-git.json index cf5617d5..f88632a0 100644 --- a/script/embedded-git.json +++ b/script/embedded-git.json @@ -1,27 +1,27 @@ { "win32-x64": { - "name": "dugite-native-v2.19.2-515d7ec-windows-x64.tar.gz", - "url": "https://github.com/desktop/dugite-native/releases/download/v2.19.2/dugite-native-v2.19.2-515d7ec-windows-x64.tar.gz", - "checksum": "786482b7b519fc65b5aafa0e2b809aae98b72746d4969e996460a4d2cf3684bb" + "name": "dugite-native-v2.20.1-f9ba893-windows-x64.tar.gz", + "url": "https://github.com/desktop/dugite-native/releases/download/v2.20.1/dugite-native-v2.20.1-f9ba893-windows-x64.tar.gz", + "checksum": "a16632a07799cc86008f190e7a6e6860746118bc58b88037a91ca144199ba07c" }, "win32-ia32": { - "name": "dugite-native-v2.19.2-515d7ec-windows-x86.tar.gz", - "url": "https://github.com/desktop/dugite-native/releases/download/v2.19.2/dugite-native-v2.19.2-515d7ec-windows-x86.tar.gz", - "checksum": "3168a9e61a2b749fe3e6dd408d86975f0a744242f63b5101b32c726bd0dae304" + "name": "dugite-native-v2.20.1-f9ba893-windows-x86.tar.gz", + "url": "https://github.com/desktop/dugite-native/releases/download/v2.20.1/dugite-native-v2.20.1-f9ba893-windows-x86.tar.gz", + "checksum": "2e5d38a46a8e9f03e84687a9997b4eb5d7b26a4817aefbe7e2089682623ffa4d" }, "darwin-x64": { - "name": "dugite-native-v2.19.2-515d7ec-macOS.tar.gz", - "url": "https://github.com/desktop/dugite-native/releases/download/v2.19.2/dugite-native-v2.19.2-515d7ec-macOS.tar.gz", - "checksum": "c786dbbb606074757ff1d112e7873655677826ee7ecbeba61c5b60fd6331d21b" + "name": "dugite-native-v2.20.1-f9ba893-macOS.tar.gz", + "url": "https://github.com/desktop/dugite-native/releases/download/v2.20.1/dugite-native-v2.20.1-f9ba893-macOS.tar.gz", + "checksum": "24280315fe18f648a322f45e11bb50b4def8e48a5976fbb8a156b07f6ca6fa70" }, "linux-x64": { - "name": "dugite-native-v2.19.2-515d7ec-ubuntu.tar.gz", - "url": "https://github.com/desktop/dugite-native/releases/download/v2.19.2/dugite-native-v2.19.2-515d7ec-ubuntu.tar.gz", - "checksum": "070c02dcb0e1350f3bcafeed96920f8a56fe9bdf5bbd92e06d38e7a052b86af5" + "name": "dugite-native-v2.20.1-f9ba893-ubuntu.tar.gz", + "url": "https://github.com/desktop/dugite-native/releases/download/v2.20.1/dugite-native-v2.20.1-f9ba893-ubuntu.tar.gz", + "checksum": "059f6e842af940e931a4c3646a55bf5fbc00e584013747ee3005c0a467c6183e" }, "linux-arm64": { - "name": "dugite-native-v2.19.2-515d7ec-arm64.tar.gz", - "url": "https://github.com/desktop/dugite-native/releases/download/v2.19.2/dugite-native-v2.19.2-515d7ec-arm64.tar.gz", - "checksum": "306724fe3ad9e191945c6d5cd6507c76bf8cabe7a4c167d5ff2757f25a140332" + "name": "dugite-native-v2.20.1-f9ba893-arm64.tar.gz", + "url": "https://github.com/desktop/dugite-native/releases/download/v2.20.1/dugite-native-v2.20.1-f9ba893-arm64.tar.gz", + "checksum": "96e008659671b1458a62ac3bda90077d6ae9f27cbf7dc5e42543f3a5fe4423c3" } } \ No newline at end of file diff --git a/test/helpers.ts b/test/helpers.ts index af4838fc..f777ad49 100644 --- a/test/helpers.ts +++ b/test/helpers.ts @@ -1,8 +1,8 @@ import { GitProcess, IGitResult } from '../lib' // NOTE: bump these versions to the latest stable releases -export const gitVersion = '2.19.2' -export const gitLfsVersion = '2.6.0' +export const gitVersion = '2.20.1' +export const gitLfsVersion = '2.6.1' const temp = require('temp').track() From afab194b0a204e5707218c593076cc5efe904419 Mon Sep 17 00:00:00 2001 From: Brendan Forster Date: Mon, 17 Dec 2018 10:01:12 -0400 Subject: [PATCH 2/2] lock file sync? --- package-lock.json | 30 ++++++++---------------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5b7631eb..bb2a33b0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1837,14 +1837,12 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -1859,20 +1857,17 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -1989,8 +1984,7 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -2002,7 +1996,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -2017,7 +2010,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -2025,14 +2017,12 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -2051,7 +2041,6 @@ "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -2132,8 +2121,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -2145,7 +2133,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -2267,7 +2254,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -4801,7 +4787,7 @@ }, "minimist": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true }