Merge 44b7815b62b9d1800c8a24887ff1c2eae2aa2ad8 into ac593985615ec2ede58e132d2e21d2b1cbd6127c

This commit is contained in:
David Allsopp 2023-01-24 14:50:09 +05:30 committed by GitHub
commit e1b045a734
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions

6
dist/index.js vendored
View File

@ -9387,8 +9387,10 @@ function prepareExistingDirectory(git, repositoryPath, repositoryUrl, clean, ref
remove = true;
}
// Fetch URL does not match
else if (!fsHelper.directoryExistsSync(path.join(repositoryPath, '.git')) ||
repositoryUrl !== (yield git.tryGetFetchUrl())) {
else if (!fsHelper.directoryExistsSync(path.join(repositoryPath, '.git'))) {
remove = clean;
}
else if (repositoryUrl !== (yield git.tryGetFetchUrl())) {
remove = true;
}
else {

View File

@ -24,10 +24,10 @@ export async function prepareExistingDirectory(
remove = true
}
// Fetch URL does not match
else if (
!fsHelper.directoryExistsSync(path.join(repositoryPath, '.git')) ||
repositoryUrl !== (await git.tryGetFetchUrl())
) {
else if (!fsHelper.directoryExistsSync(path.join(repositoryPath, '.git'))) {
remove = clean
}
else if (repositoryUrl !== (await git.tryGetFetchUrl())) {
remove = true
} else {
// Delete any index.lock and shallow.lock left by a previously canceled run or crashed git process