From cc9d256ca5cd64255d28e25f525c0e1765ad2f75 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Mon, 12 Oct 2020 22:51:09 +0200
Subject: [PATCH] fix(git): getBranchFiles from origin
Closes #7454
---
lib/util/git/index.ts | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/lib/util/git/index.ts b/lib/util/git/index.ts
index f751b8a773..296c99a749 100644
--- a/lib/util/git/index.ts
+++ b/lib/util/git/index.ts
@@ -500,7 +500,10 @@ export async function getBranchLastCommitTime(
export async function getBranchFiles(branchName: string): Promise<string[]> {
await syncBranch(branchName);
try {
- const diff = await git.diffSummary([`${branchName}^`]);
+ const diff = await git.diffSummary([
+ `origin/${branchName}`,
+ `origin/${branchName}^`,
+ ]);
return diff.files.map((file) => file.file);
} catch (err) /* istanbul ignore next */ {
logger.warn({ err }, 'getBranchFiles error');
--
GitLab