development/github-desktop
development/github-desktop
1
0
Fork 0
mirror of https://github.com/desktop/desktop synced 2024-11-05 20:49:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #11854 from desktop/bump-to-dugite-1.102.0

Browse source 
Bump dugite to 1.102.0
This commit is contained in:
tidy-dev 2021-03-24 19:43:01 -04:00 committed by tidy-dev
parent 62cf6e4249
commit 5cfa4b8fa6
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/package.json
View file

@ -28,7 +28,7 @@
"desktop-trampoline": "desktop/desktop-trampoline#v0.9.4",
"dexie": "^2.0.0",
"double-ended-queue": "^2.1.0-0",
"dugite": "^1.100.0",
"dugite": "^1.102.0",
"electron-window-state": "^5.0.3",
"event-kit": "^2.0.0",
"file-metadata": "^1.0.0",

2
app/src/lib/git/core.ts
View file

@ -408,6 +408,8 @@ function getDescriptionForError(error: DugiteError): string | null {
return 'A tag with that name already exists'
case DugiteError.MergeWithLocalChanges:
case DugiteError.RebaseWithLocalChanges:
case DugiteError.GPGFailedToSignData:
case DugiteError.ConflictModifyDeletedInBranch:
return null
case DugiteError.MergeCommitNoMainlineOption:
// Note: This has been made specific to cherry pick, but this error can

8
app/yarn.lock
View file

@ -364,10 +364,10 @@ double-ended-queue@^2.1.0-0:
resolved "https://registry.yarnpkg.com/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz#103d3527fd31528f40188130c841efdd78264e5c"
integrity sha1-ED01J/0xUo9AGIEwyEHv3XgmTlw=
dugite@^1.100.0:
version "1.100.0"
resolved "https://registry.yarnpkg.com/dugite/-/dugite-1.100.0.tgz#4e531a00945e7eb8ab14aa253d351f6689d4038e"
integrity sha512-WEoeDJ1wzC9tbULzmEw/cqpilL9ExoulVGepc7nlRkZNmsEnKbLRZW+Ims/uyrV02NA00LetkP/CsEpilNeq1A==
dugite@^1.102.0:
version "1.102.0"
resolved "https://registry.yarnpkg.com/dugite/-/dugite-1.102.0.tgz#15fde8ec6726f03dabcee06e7e5ee5492bf9bf74"
integrity sha512-z3eqQd0sCAt/6HgEDFDKw/VFp9LJG5v7MpR0wQAZh4Y/vz/pt5rdjJozVGVX9kGP3sHbIVz251Ooi8lrLupUeQ==
dependencies:
checksum "^0.1.1"
got "^9.6.0"