From c696dc2cd6b763fc2f3d83cba330d5e5518ef47e Mon Sep 17 00:00:00 2001 From: Joshua Chen Date: Mon, 21 Mar 2022 20:13:40 +0800 Subject: [PATCH] test: fix Windows test for gitUtils (#6951) * test: fix Windows test for gitUtils * change this * fix --- .../docusaurus-utils/src/__tests__/gitUtils.test.ts | 11 +++++++---- packages/docusaurus-utils/src/gitUtils.ts | 2 ++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/packages/docusaurus-utils/src/__tests__/gitUtils.test.ts b/packages/docusaurus-utils/src/__tests__/gitUtils.test.ts index 1915ca2e6a..64bbf62a48 100644 --- a/packages/docusaurus-utils/src/__tests__/gitUtils.test.ts +++ b/packages/docusaurus-utils/src/__tests__/gitUtils.test.ts @@ -23,6 +23,12 @@ function createTempRepo() { stderr: ${res.stderr} stdout: ${res.stdout}`); } + // Doesn't matter currently + shell.exec('git config user.email "test@jc-verse.com"', { + cwd: dir, + silent: true, + }); + shell.exec('git config user.name "Test"', {cwd: dir, silent: true}); } commit(msg: string, date: string, author: string) { const addRes = shell.exec('git add .', {cwd: this.dir, silent: true}); @@ -30,10 +36,7 @@ stdout: ${res.stdout}`); `git commit -m "${msg}" --date "${date}T00:00:00Z" --author "${author}"`, { cwd: this.dir, - env: { - GIT_COMMITTER_DATE: `${date}T00:00:00Z`, - GIT_COMMITTER_NAME: author, - }, + env: {GIT_COMMITTER_DATE: `${date}T00:00:00Z`}, silent: true, }, ); diff --git a/packages/docusaurus-utils/src/gitUtils.ts b/packages/docusaurus-utils/src/gitUtils.ts index 06f0e8f295..9902c720b9 100644 --- a/packages/docusaurus-utils/src/gitUtils.ts +++ b/packages/docusaurus-utils/src/gitUtils.ts @@ -53,6 +53,8 @@ export function getFileCommitDate( ); } + // Commit time and author name; not using author time so that amended commits + // can have their dates updated let formatArg = '--format=%ct'; if (includeAuthor) { formatArg += ',%an';