development/github-desktop
development/github-desktop
1
0
Fork 0
mirror of https://github.com/desktop/desktop synced 2024-10-02 14:23:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18704 from desktop/dugite-2.45.1

Browse source 
Bump to dugite 3.0.0-rc1 (Git 2.45.1)
This commit is contained in:
Markus Olsson 2024-05-30 10:43:18 +02:00 committed by GitHub
parent c0313c1b96 f711df3217
commit 8e8de5307f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 8 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/package.json
View file

@ -32,7 +32,7 @@
"desktop-trampoline": "desktop/desktop-trampoline#v0.9.8",
"dexie": "^3.2.2",
"dompurify": "^2.3.3",
"dugite": "3.0.0-rc0",
"dugite": "3.0.0-rc1",
"electron-window-state": "^5.0.3",
"event-kit": "^2.0.0",
"focus-trap-react": "^8.1.0",

15
app/src/lib/git/cherry-pick.ts
View file

@ -157,7 +157,7 @@ export async function cherryPick(
)
}
// --keep-redundant-commits follows pattern of making sure someone cherry
// --empty=keep follows pattern of making sure someone cherry
// picked commit summaries appear in target branch history even tho they may
// be empty. This flag also results in the ability to cherry pick empty
// commits (thus, --allow-empty is not required.)
@ -167,12 +167,7 @@ export async function cherryPick(
// there could be multiple empty commits. I.E. If user does a range that
// includes commits from that merge.
const result = await git(
[
'cherry-pick',
...commits.map(c => c.sha),
'--keep-redundant-commits',
'-m 1',
],
['cherry-pick', ...commits.map(c => c.sha), '--empty=keep', '-m 1'],
repository.path,
'cherry-pick',
baseOptions
@ -465,12 +460,8 @@ export async function continueCherryPick(
return parseCherryPickResult(result)
}
// --keep-redundant-commits follows pattern of making sure someone cherry
// picked commit summaries appear in target branch history even tho they may
// be empty. This flag also results in the ability to cherry pick empty
// commits (thus, --allow-empty is not required.)
const result = await git(
['cherry-pick', '--continue', '--keep-redundant-commits'],
['cherry-pick', '--continue'],
repository.path,
'continueCherryPick',
options

8
app/yarn.lock
View file

@ -365,10 +365,10 @@ dompurify@^2.3.3:
resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.3.tgz#c1af3eb88be47324432964d8abc75cf4b98d634c"
integrity sha512-dqnqRkPMAjOZE0FogZ+ceJNM2dZ3V/yNOuFB7+39qpO93hHhfRpHw3heYQC7DPK9FqbQTfBKUJhiSfz4MvXYwg==
dugite@3.0.0-rc0:
version "3.0.0-rc0"
resolved "https://registry.yarnpkg.com/dugite/-/dugite-3.0.0-rc0.tgz#889919aa854469c0b5ead4606cbcf77f4b996cf5"
integrity sha512-+4hOn/gjQzwCryZR0jlL2MjXwuPLSHev202PkcvP7hjk5se0dIApFJwZnANvFYacPgXck3xDWjYGwnq//MP6ng==
dugite@3.0.0-rc1:
version "3.0.0-rc1"
resolved "https://registry.yarnpkg.com/dugite/-/dugite-3.0.0-rc1.tgz#5b3aa1776b7d4eb54cabc5ab173ecef68207b594"
integrity sha512-91GOxO7rookT7QKzhbxVAkH/zkExxL8CnxHc6Gnq8O/EW1310j4D1GQhQDEqSPYgj/akhN2sPoGptEuBxSosvA==
dependencies:
progress "^2.0.3"
tar "^6.1.11"