Merge pull request #432 from desktop/releases/1.100.0

Releases/1.100.0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dugite",
-  "version": "1.99.0",
+  "version": "1.100.0",
   "description": "Elegant bindings for Git",
   "main": "./build/lib/index.js",
   "typings": "./build/lib/index.d.ts",

script/embedded-git.json

@@ -1,22 +1,22 @@
 {
   "win32-x64": {
-    "name": "dugite-native-v2.29.2-f9ceb12-windows-x64.tar.gz",
-    "url": "https://github.com/desktop/dugite-native/releases/download/v2.29.2-2/dugite-native-v2.29.2-f9ceb12-windows-x64.tar.gz",
-    "checksum": "b783f64d4abe3327ddb7fb1ad4ebb3027dd610752b5684d79d60f7ad75926be5"
+    "name": "dugite-native-v2.29.3-f221234-windows-x64.tar.gz",
+    "url": "https://github.com/desktop/dugite-native/releases/download/v2.29.3-1/dugite-native-v2.29.3-f221234-windows-x64.tar.gz",
+    "checksum": "6a92fbfbfd3148a89a6b8c949f72a50271d71223c35651d0f7df5667a09ac54f"
   },
   "win32-ia32": {
-    "name": "dugite-native-v2.29.2-f9ceb12-windows-x86.tar.gz",
-    "url": "https://github.com/desktop/dugite-native/releases/download/v2.29.2-2/dugite-native-v2.29.2-f9ceb12-windows-x86.tar.gz",
-    "checksum": "a983bd0e0fedc994906a3759a19325038a29ba8f172f93576d7b2ea0c5f72e44"
+    "name": "dugite-native-v2.29.3-f221234-windows-x86.tar.gz",
+    "url": "https://github.com/desktop/dugite-native/releases/download/v2.29.3-1/dugite-native-v2.29.3-f221234-windows-x86.tar.gz",
+    "checksum": "b9e5192bbebbacb58ef3229f9ef9ab3e80df4bf65cfd51cba12778068d42e13a"
   },
   "darwin-x64": {
-    "name": "dugite-native-v2.29.2-f9ceb12-macOS.tar.gz",
-    "url": "https://github.com/desktop/dugite-native/releases/download/v2.29.2-2/dugite-native-v2.29.2-f9ceb12-macOS.tar.gz",
-    "checksum": "ff16488ebbb3a0000fac34c8afc01bc4e839ad478717fbcbbe0c207642b5872c"
+    "name": "dugite-native-v2.29.3-f221234-macOS.tar.gz",
+    "url": "https://github.com/desktop/dugite-native/releases/download/v2.29.3-1/dugite-native-v2.29.3-f221234-macOS.tar.gz",
+    "checksum": "4cfc4045f6f0bc3cbf75082e0ce2e1e9c71987d59ce200a7cbfbe9da743015a8"
   },
   "linux-x64": {
-    "name": "dugite-native-v2.29.2-f9ceb12-ubuntu.tar.gz",
-    "url": "https://github.com/desktop/dugite-native/releases/download/v2.29.2-2/dugite-native-v2.29.2-f9ceb12-ubuntu.tar.gz",
-    "checksum": "c23de590ba88f73cb3dc96a7d34d6b9b0432bb801c8c330529a72d6f6a0fd14e"
+    "name": "dugite-native-v2.29.3-f221234-ubuntu.tar.gz",
+    "url": "https://github.com/desktop/dugite-native/releases/download/v2.29.3-1/dugite-native-v2.29.3-f221234-ubuntu.tar.gz",
+    "checksum": "9c3826b45f9d94e93acc79ddbfdb06fe6e9b8a48df7c59f479c9257d1a3d53cf"
   }
 }

test/fast/git-process-test.ts

@@ -4,7 +4,7 @@ import * as crypto from 'crypto'
 
 import { GitProcess, GitError, RepositoryDoesNotExistErrorCode } from '../../lib'
 import { GitErrorRegexes } from '../../lib/errors'
-import { initialize, verify, initializeWithRemote } from '../helpers'
+import { initialize, verify, initializeWithRemote, gitForWindowsVersion } from '../helpers'
 
 import { gitVersion } from '../helpers'
 
@@ -14,7 +14,11 @@ describe('git-process', () => {
   it('can launch git', async () => {
     const result = await GitProcess.exec(['--version'], __dirname)
     expect(result.stderr).toBe('')
-    expect(result.stdout).toContain(`git version ${gitVersion}`)
+    if (result.stdout.includes('windows')) {
+      expect(result.stdout).toContain(`git version ${gitForWindowsVersion}`)
+    } else {
+      expect(result.stdout).toContain(`git version ${gitVersion}`)
+    }
     expect(result.exitCode).toBe(0)
   })
 

test/helpers.ts

@@ -1,7 +1,8 @@
 import { GitProcess, IGitResult, GitError } from '../lib'
 
 // NOTE: bump these versions to the latest stable releases
-export const gitVersion = '2.29.2'
+export const gitVersion = '2.29.3'
+export const gitForWindowsVersion = '2.29.2.windows.4'
 export const gitLfsVersion = '2.13.2'
 
 const temp = require('temp').track()

test/slow/git-spawn-test.ts

@@ -4,7 +4,7 @@ import * as Path from 'path'
 import { ChildProcess } from 'child_process'
 import { GitProcess } from '../../lib'
 
-import { gitVersion } from '../helpers'
+import { gitForWindowsVersion, gitVersion } from '../helpers'
 const temp = require('temp').track()
 
 const maximumStringSize = 268435441
@@ -38,7 +38,11 @@ describe('GitProcess.spawn', () => {
   it('can launch git', async () => {
     const process = GitProcess.spawn(['--version'], __dirname)
     const result = await bufferOutput(process)
-    expect(result).toContain(`git version ${gitVersion}`)
+    if (result.includes('windows')) {
+      expect(result).toContain(`git version ${gitForWindowsVersion}`)
+    } else {
+      expect(result).toContain(`git version ${gitVersion}`)
+    }
   })
 
   it('returns expected exit codes', done => {