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

Refactor to a boolean isCherryPickHeadFound

Browse source
This commit is contained in:
tidy-dev 2021-02-22 13:55:21 -05:00
parent 30eda681ed
commit e9c39c22af
1 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -203,8 +203,7 @@ function parseCherryPickResult(result: IGitResult): CherryPickResult {
export async function getCherryPickSnapshot(
repository: Repository
): Promise<ICherryPickSnapshot | null> {
const cherryPickHead = readCherryPickHead(repository)
if (cherryPickHead === null) {
if (isCherryPickHeadFound(repository)) {
// If there no cherry pick head, there is no cherry pick in progress.
return null
}
@ -321,8 +320,7 @@ export async function continueCherryPick(
}
// make sure cherry pick is still in progress to continue
const cherryPickCurrentCommit = await readCherryPickHead(repository)
if (cherryPickCurrentCommit === null) {
if (await isCherryPickHeadFound(repository)) {
return CherryPickResult.Aborted
}
@ -368,29 +366,24 @@ export async function abortCherryPick(repository: Repository) {
}
/**
* Attempt to read the `.git/CHERRY_PICK_HEAD` file inside a repository to confirm
* the cherry pick is still active.
* Check if the `.git/CHERRY_PICK_HEAD` file exists
*/
async function readCherryPickHead(
export async function isCherryPickHeadFound(
repository: Repository
): Promise<string | null> {
): Promise<boolean> {
try {
const cherryPickHead = Path.join(
const cherryPickHeadPath = Path.join(
repository.path,
'.git',
'CHERRY_PICK_HEAD'
)
const cherryPickCurrentCommitOutput = await FSE.readFile(
cherryPickHead,
'utf8'
)
return cherryPickCurrentCommitOutput.trim()
return FSE.pathExists(cherryPickHeadPath)
} catch (err) {
log.warn(
`[cherryPick] a problem was encountered reading .git/CHERRY_PICK_HEAD,
so it is unsafe to continue cherry picking`,
err
)
return null
return false
}
}