renovate/renovate
1
0
Fork 0
mirror of https://github.com/renovatebot/renovate.git synced 2025-01-10 14:06:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

fix: check cache before cloning (#16517)

Browse source
This commit is contained in:
RahulGautamSingh 2022-07-11 14:28:51 +05:30 committed by GitHub
parent fa17909e8f
commit e10aa6aa5a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/util/git/index.ts
View file

@ -621,8 +621,6 @@ export async function isBranchConflicted(
branch: string
): Promise<boolean> {
logger.debug(`isBranchConflicted(${baseBranch}, ${branch})`);
await syncGit();
await writeGitAuthor();
const baseBranchSha = getBranchCommit(baseBranch);
const branchSha = getBranchCommit(branch);
@ -648,6 +646,8 @@ export async function isBranchConflicted(
}
let result = false;
await syncGit();
await writeGitAuthor();
const origBranch = config.currentBranch;
try {