Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

git 2.26.2-1 #404

Closed
wants to merge 10 commits into from
Closed

git 2.26.2-1 #404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0843c0c
up to git 2.26.0
outofambit Apr 13, 2020
fa37b8d
up git version in test
outofambit Apr 13, 2020
06179e1
fix error parsing breakage
outofambit Apr 13, 2020
7d03910
fix tests
outofambit Apr 13, 2020
9c3b134
1.91.0
outofambit Apr 13, 2020
0abb270
use dugite-native v2.26.2
rafeca Apr 21, 2020
25f452d
Make git version on test less restrictive
rafeca Apr 21, 2020
0a3d0c3
1.91.1
rafeca Apr 21, 2020
629a4b6
Merge branch 'master' into release/git-2.26.2-1
rafeca Jun 23, 2020
1dda875
1.91.2
rafeca Jun 23, 2020
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
4 changes: 2 additions & 2 deletions lib/errors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
26 changes: 13 additions & 13 deletions script/embedded-git.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
}
}
6 changes: 3 additions & 3 deletions test/fast/git-process-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion test/helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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()
Expand Down