From 2cdd8f4b0c3e1bedf25dc1e6ab1d97a9f7db1c5e Mon Sep 17 00:00:00 2001 From: Rhys Arkins Date: Sun, 5 Jul 2020 08:28:34 +0200 Subject: [PATCH] refactor: simplify sync state --- lib/util/git/index.spec.ts | 1 + lib/util/git/index.ts | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/util/git/index.spec.ts b/lib/util/git/index.spec.ts index de0a8e374265ac..592e6c204ae46d 100644 --- a/lib/util/git/index.spec.ts +++ b/lib/util/git/index.spec.ts @@ -55,6 +55,7 @@ describe('platform/git', () => { gitAuthorName: 'test', gitAuthorEmail: 'test@example.com', }); + await git.syncGit(); }); afterEach(async () => { diff --git a/lib/util/git/index.ts b/lib/util/git/index.ts index 9e93484f079338..6612fb90d1ef5c 100644 --- a/lib/util/git/index.ts +++ b/lib/util/git/index.ts @@ -39,7 +39,6 @@ interface LocalConfig extends StorageConfig { baseBranchSha: string; branchExists: Record; branchPrefix: string; - syncCompleted: boolean; } // istanbul ignore next @@ -148,10 +147,9 @@ export async function getSubmodules(): Promise { } export async function syncGit(): Promise { - if (config.syncCompleted) { + if (git) { return; } - config.syncCompleted = true; logger.debug('Initializing git repository into ' + config.localDir); const gitHead = join(config.localDir, '.git/HEAD'); let clone = true; @@ -237,6 +235,7 @@ export async function syncGit(): Promise { export async function initRepo(args: StorageConfig): Promise { config = { ...args } as any; config.branchExists = {}; + git = undefined; await syncGit(); }