Revert "feat(git): make gitAuthor repo-configurable (#11539)"

This reverts commit fb75b2f.
renovatebot · Sep 3, 2021 · 2c789ec · 2c789ec
1 parent ec3b5a1
commit 2c789ec
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 12 deletions.
diff --git a/docs/usage/configuration-options.md b/docs/usage/configuration-options.md
@@ -719,14 +719,6 @@ 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.
 
-## gitAuthor
-
-You can customize the Git author that's used whenever Renovate creates a commit.
-The `gitAuthor` option accepts a RFC5322-compliant string.
-
-**Note** We strongly recommend that the Git author email you use is unique to Renovate.
-Otherwise, if another bot or human shares the same email and pushes to one of Renovate's branches then Renovate will mistake the branch as unmodified and potentially force push over the changes.
-
 ## gitIgnoredAuthors
 
 Specify commit authors ignored by Renovate.

diff --git a/docs/usage/self-hosted-configuration.md b/docs/usage/self-hosted-configuration.md
@@ -205,6 +205,14 @@ This should be set to a Personal Access Token (GitHub only) when `forkMode` is s
 Renovate will use this token to fork the repository into the personal space of the person owning the Personal Access Token.
 Renovate will then create branches on the fork and opens Pull Requests on the parent repository.
 
+## gitAuthor
+
+You can customize the Git author that's used whenever Renovate creates a commit.
+The `gitAuthor` option accepts a RFC5322-compliant string.
+
+**Note** We strongly recommend that the Git author email you use is unique to Renovate.
+Otherwise, if another bot or human shares the same email and pushes to one of Renovate's branches then Renovate will mistake the branch as unmodified and potentially force push over the changes.
+
 ## gitNoVerify
 
 Controls when Renovate passes the `--no-verify` flag to `git`.

diff --git a/lib/config/options/index.ts b/lib/config/options/index.ts
@@ -634,6 +634,7 @@ const options: RenovateOptions[] = [
     name: 'gitAuthor',
     description: 'Author to use for Git commits. Must conform to RFC5322.',
     type: 'string',
+    globalOnly: true,
   },
   {
     name: 'gitPrivateKey',

diff --git a/lib/platform/index.ts b/lib/platform/index.ts
@@ -53,7 +53,6 @@ export async function initPlatform(config: AllConfig): Promise<AllConfig> {
     logger.debug(`Using platform gitAuthor: ${String(platformInfo.gitAuthor)}`);
     returnConfig.gitAuthor = platformInfo.gitAuthor;
   }
-  // This is done for validation and will be overridden later once repo config is incorporated
   setGitAuthor(returnConfig.gitAuthor);
   const platformRule: HostRule = {
     hostType: returnConfig.platform,

diff --git a/lib/util/git/index.ts b/lib/util/git/index.ts
@@ -274,11 +274,9 @@ export async function writeGitAuthor(): Promise<void> {
 export async function setUserRepoConfig({
   branchPrefix,
   gitIgnoredAuthors,
-  gitAuthor,
 }: RenovateConfig): Promise<void> {
   await setBranchPrefix(branchPrefix);
   config.ignoredAuthors = gitIgnoredAuthors ?? [];
-  setGitAuthor(gitAuthor);
 }
 
 export async function getSubmodules(): Promise<string[]> {
@@ -383,6 +381,7 @@ export async function syncGit(): Promise<void> {
     }
     logger.warn({ err }, 'Cannot retrieve latest commit');
   }
+  await writeGitAuthor();
   config.currentBranch = config.currentBranch || (await getDefaultBranch(git));
   if (config.branchPrefix) {
     await setBranchPrefix(config.branchPrefix);
@@ -734,7 +733,6 @@ export async function commitFiles({
   }
   const { localDir } = getGlobalConfig();
   await configSigningKey(localDir);
-  await writeGitAuthor();
   try {
     await git.reset(ResetMode.HARD);
     await git.raw(['clean', '-fd']);