feat(git): Specify additional git authors to ignore

docs/usage/configuration-options.md

@@ -635,6 +635,20 @@ If configured, Renovate bypasses its normal major/minor/patch upgrade logic and
 Beware that Renovate follows tags strictly.
 For example, if you are following a tag like `next` and then that stream is released as `stable` and `next` is no longer being updated then that means your dependencies also won't be getting updated.
 
+## gitIgnoredAuthors
+
+Specify commit authors ignored by Renovate.
+
+If you have other bots which commit on top of Renovate PRs, you probably want Renovate to rebase those PRs instead of treating them as modified.
+
+Example:
+
+```json
+{
+  "gitIgnoredAuthors": ["some-bot@example.org"]
+}
+```
+
 ## gitLabAutomerge
 
 Caution (fixed in GitLab >= 12.7): when this option is enabled it is possible due to a bug in GitLab that MRs with failing pipelines might still get merged.

lib/config/definitions.ts

@@ -589,6 +589,14 @@ const options: RenovateOptions[] = [
     admin: true,
     stage: 'global',
   },
+  {
+    name: 'gitIgnoredAuthors',
+    description:
+      'Additional git authors which are ignored by Renovate. Must conform to RFC5322.',
+    type: 'array',
+    subType: 'string',
+    stage: 'repository',
+  },
   {
     name: 'enabledManagers',
     description:

lib/config/types.ts

@@ -61,6 +61,7 @@ export interface RenovateSharedConfig {
   suppressNotifications?: string[];
   timezone?: string;
   unicodeEmoji?: boolean;
+  gitIgnoredAuthors?: string[];
 }
 
 // Config options used only within the global worker

lib/util/git/index.spec.ts

@@ -3,6 +3,16 @@ import Git from 'simple-git';
 import tmp from 'tmp-promise';
 import * as git from '.';
 
+function userConfig(
+  config: Partial<git.UserRepoConfig> = {}
+): git.UserRepoConfig {
+  return {
+    branchPrefix: 'renovate/',
+    gitIgnoredAuthors: [],
+    ...config,
+  };
+}
+
 describe('platform/git', () => {
   jest.setTimeout(15000);
 
@@ -73,7 +83,7 @@ describe('platform/git', () => {
       gitAuthorName: 'Jest',
       gitAuthorEmail: 'Jest@example.com',
     });
-    await git.setBranchPrefix('renovate/');
+    await git.setUserRepoConfig(userConfig());
     await git.syncGit();
   });
 
@@ -145,11 +155,17 @@ describe('platform/git', () => {
     it('should return false when branch is not found', async () => {
       expect(await git.isBranchModified('renovate/not_found')).toBe(false);
     });
-    it('should return true when author matches', async () => {
+    it('should return false when author matches', async () => {
       expect(await git.isBranchModified('renovate/future_branch')).toBe(false);
       expect(await git.isBranchModified('renovate/future_branch')).toBe(false);
     });
-    it('should return false when custom author', async () => {
+    it('should return false when author is ignored', async () => {
+      await git.setUserRepoConfig(
+        userConfig({ gitIgnoredAuthors: ['custom@example.com'] })
+      );
+      expect(await git.isBranchModified('renovate/custom_author')).toBe(false);
+    });
+    it('should return true when custom author is unknown', async () => {
       expect(await git.isBranchModified('renovate/custom_author')).toBe(true);
     });
   });
@@ -389,7 +405,7 @@ describe('platform/git', () => {
         url: base.path,
       });
 
-      await git.setBranchPrefix('renovate/');
+      await git.setUserRepoConfig(userConfig({ branchPrefix: 'renovate/' }));
       expect(git.branchExists('renovate/test')).toBe(true);
 
       await git.initRepo({
@@ -400,7 +416,7 @@ describe('platform/git', () => {
       await repo.checkout('renovate/test');
       await repo.commit('past message3', ['--amend']);
 
-      await git.setBranchPrefix('renovate/');
+      await git.setUserRepoConfig(userConfig({ branchPrefix: 'renovate/' }));
       expect(git.branchExists('renovate/test')).toBe(true);
     });
 

lib/util/git/index.ts

@@ -51,6 +51,7 @@ interface LocalConfig extends StorageConfig {
   branchCommits: Record<string, CommitSha>;
   branchIsModified: Record<string, boolean>;
   branchPrefix: string;
+  ignoredAuthors: string[];
 }
 
 // istanbul ignore next
@@ -165,6 +166,7 @@ async function fetchBranchCommits(): Promise<void> {
 
 export async function initRepo(args: StorageConfig): Promise<void> {
   config = { ...args } as any;
+  config.ignoredAuthors = [];
   config.additionalBranches = [];
   config.branchIsModified = {};
   git = Git(config.localDir);
@@ -200,7 +202,7 @@ async function cleanLocalBranches(): Promise<void> {
  * When we initially clone, we clone only the default branch so how no knowledge of other branches existing.
  * By calling this function once the repo's branchPrefix is known, we can fetch all of Renovate's branches in one command.
  */
-export async function setBranchPrefix(branchPrefix: string): Promise<void> {
+async function setBranchPrefix(branchPrefix: string): Promise<void> {
   config.branchPrefix = branchPrefix;
   // If the repo is already cloned then set branchPrefix now, otherwise it will be called again during syncGit()
   if (gitInitialized) {
@@ -215,6 +217,23 @@ export async function setBranchPrefix(branchPrefix: string): Promise<void> {
   }
 }
 
+function setIgnoredAuthors(ignoredAuthors?: string[]): void {
+  config.ignoredAuthors = ignoredAuthors ?? [];
+}
+
+export interface UserRepoConfig {
+  branchPrefix: string;
+  gitIgnoredAuthors: string[];
+}
+
+export async function setUserRepoConfig({
+  branchPrefix,
+  gitIgnoredAuthors,
+}: Partial<UserRepoConfig>): Promise<void> {
+  await setBranchPrefix(branchPrefix);
+  setIgnoredAuthors(gitIgnoredAuthors);
+}
+
 export async function getSubmodules(): Promise<string[]> {
   try {
     return (
@@ -478,7 +497,8 @@ export async function isBranchModified(branchName: string): Promise<boolean> {
   const { gitAuthorEmail } = config;
   if (
     lastAuthor === process.env.RENOVATE_LEGACY_GIT_AUTHOR_EMAIL || // remove in next major release
-    lastAuthor === gitAuthorEmail
+    lastAuthor === gitAuthorEmail ||
+    config.ignoredAuthors.some((ignoredAuthor) => lastAuthor === ignoredAuthor)
   ) {
     // author matches - branch has not been modified
     config.branchIsModified[branchName] = false;

lib/workers/repository/init/index.ts

@@ -1,7 +1,7 @@
 import { RenovateConfig } from '../../../config';
 import { logger } from '../../../logger';
 import { clone } from '../../../util/clone';
-import { setBranchPrefix } from '../../../util/git';
+import { setUserRepoConfig } from '../../../util/git';
 import { checkIfConfigured } from '../configured';
 import { initApis } from './apis';
 import { initializeCaches } from './cache';
@@ -20,7 +20,7 @@ export async function initRepo(
   config = await initApis(config);
   config = await getRepoConfig(config);
   checkIfConfigured(config);
-  await setBranchPrefix(config.branchPrefix);
+  await setUserRepoConfig(config);
   config = await detectVulnerabilityAlerts(config);
   // istanbul ignore if
   if (config.printConfig) {