development/github-desktop
development/github-desktop
1
0
Fork 0
mirror of https://github.com/desktop/desktop synced 2024-07-05 00:58:57 +00:00
Code Issues Projects Releases Wiki Activity

--empty=keep is the substitute for the deprecated --keep-redundant-commits

Browse Source
This commit is contained in:
Markus Olsson 2024-05-29 13:04:41 +02:00
parent 4e8a2ac0de
commit 5d441015f8
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
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