mirror of
https://github.com/actions/checkout.git
synced 2025-03-28 11:00:05 +01:00
Merge 44b7815b62
into ac59398561
This commit is contained in:
commit
e1b045a734
2 changed files with 8 additions and 6 deletions
6
dist/index.js
vendored
6
dist/index.js
vendored
|
@ -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 {
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue