From 5e01de9e838c38ff4a16f58e3dfd52ee4eacd4d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20O=E2=80=99Shannessy?= Date: Fri, 15 May 2026 11:43:23 -0700 Subject: [PATCH 1/4] Make execa usage consistent in git utils This brings the usage in line with the rest of the calls to git. --- packages/docusaurus-utils/src/vcs/gitUtils.ts | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/packages/docusaurus-utils/src/vcs/gitUtils.ts b/packages/docusaurus-utils/src/vcs/gitUtils.ts index 7ca4919fd673..6ced5a298296 100644 --- a/packages/docusaurus-utils/src/vcs/gitUtils.ts +++ b/packages/docusaurus-utils/src/vcs/gitUtils.ts @@ -147,25 +147,25 @@ export async function getFileCommitDate( // See why: https://github.com/facebook/docusaurus/pull/10022 const resultFormat = includeAuthor ? 'RESULT:%ct,%an' : 'RESULT:%ct'; - const args = [ - `--format=${resultFormat}`, - '--max-count=1', - age === 'oldest' ? '--follow --diff-filter=A' : undefined, - ] - .filter(Boolean) - .join(' '); - - // Do not include GPG signature in the log output - // See https://github.com/facebook/docusaurus/pull/10022 - const command = `git -c log.showSignature=false log ${args} -- "${path.basename( - file, - )}"`; - const result = (await GitCommandQueue.add(() => { - return execa(command, { - cwd: path.dirname(file), - shell: true, - }); + return execa( + 'git', + [ + // Do not include GPG signature in the log output + // See https://github.com/facebook/docusaurus/pull/10022 + '-c', + 'log.showSignature=false', + 'log', + `--format=${resultFormat}`, + '--max-count=1', + ...(age === 'oldest' ? ['--follow', '--diff-filter=A'] : []), + path.basename(file), + ], + { + cwd: path.dirname(file), + shell: true, + }, + ); }))!; if (result.exitCode !== 0) { From 6287dc83d974b51978bc171a4f1fe538b4e57db6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20O=E2=80=99Shannessy?= Date: Fri, 15 May 2026 12:26:49 -0700 Subject: [PATCH 2/4] Apply suggestions from code review Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- packages/docusaurus-utils/src/vcs/gitUtils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/docusaurus-utils/src/vcs/gitUtils.ts b/packages/docusaurus-utils/src/vcs/gitUtils.ts index 6ced5a298296..a1c13997401a 100644 --- a/packages/docusaurus-utils/src/vcs/gitUtils.ts +++ b/packages/docusaurus-utils/src/vcs/gitUtils.ts @@ -159,11 +159,11 @@ export async function getFileCommitDate( `--format=${resultFormat}`, '--max-count=1', ...(age === 'oldest' ? ['--follow', '--diff-filter=A'] : []), + '--', path.basename(file), ], { cwd: path.dirname(file), - shell: true, }, ); }))!; From 28736c14350290482e06a3bc1b80946e32e0bb7b Mon Sep 17 00:00:00 2001 From: sebastien Date: Thu, 21 May 2026 13:52:28 +0200 Subject: [PATCH 3/4] trigger CI with former VCS 'git-ad-hoc' --- .../templates/classic-typescript/docusaurus.config.ts | 1 + website/docusaurus.config.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/create-docusaurus/templates/classic-typescript/docusaurus.config.ts b/packages/create-docusaurus/templates/classic-typescript/docusaurus.config.ts index 671bab5472ca..00ea48de6378 100644 --- a/packages/create-docusaurus/templates/classic-typescript/docusaurus.config.ts +++ b/packages/create-docusaurus/templates/classic-typescript/docusaurus.config.ts @@ -12,6 +12,7 @@ const config: Config = { // Future flags, see https://docusaurus.io/docs/api/docusaurus-config#future future: { v4: true, // Improve compatibility with the upcoming Docusaurus v4 + experimental_vcs: 'git-ad-hoc', }, // Set the production url of your site here diff --git a/website/docusaurus.config.ts b/website/docusaurus.config.ts index 82a7ba2e23d0..94701b5b3a3d 100644 --- a/website/docusaurus.config.ts +++ b/website/docusaurus.config.ts @@ -112,7 +112,7 @@ if (isSlower) { const router = process.env .DOCUSAURUS_ROUTER as DocusaurusConfig['future']['experimental_router']; -const vcs = process.env.DOCUSAURUS_SITE_VCS as VcsPreset; +const vcs = 'git-ad-hoc' as VcsPreset; const isDev = process.env.NODE_ENV === 'development'; From c314d5af067c74b353667c7382bda2ea460a59d0 Mon Sep 17 00:00:00 2001 From: sebastien Date: Thu, 21 May 2026 14:08:04 +0200 Subject: [PATCH 4/4] Revert "trigger CI with former VCS 'git-ad-hoc'" This reverts commit 28736c14350290482e06a3bc1b80946e32e0bb7b. --- .../templates/classic-typescript/docusaurus.config.ts | 1 - website/docusaurus.config.ts | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/create-docusaurus/templates/classic-typescript/docusaurus.config.ts b/packages/create-docusaurus/templates/classic-typescript/docusaurus.config.ts index 00ea48de6378..671bab5472ca 100644 --- a/packages/create-docusaurus/templates/classic-typescript/docusaurus.config.ts +++ b/packages/create-docusaurus/templates/classic-typescript/docusaurus.config.ts @@ -12,7 +12,6 @@ const config: Config = { // Future flags, see https://docusaurus.io/docs/api/docusaurus-config#future future: { v4: true, // Improve compatibility with the upcoming Docusaurus v4 - experimental_vcs: 'git-ad-hoc', }, // Set the production url of your site here diff --git a/website/docusaurus.config.ts b/website/docusaurus.config.ts index 94701b5b3a3d..82a7ba2e23d0 100644 --- a/website/docusaurus.config.ts +++ b/website/docusaurus.config.ts @@ -112,7 +112,7 @@ if (isSlower) { const router = process.env .DOCUSAURUS_ROUTER as DocusaurusConfig['future']['experimental_router']; -const vcs = 'git-ad-hoc' as VcsPreset; +const vcs = process.env.DOCUSAURUS_SITE_VCS as VcsPreset; const isDev = process.env.NODE_ENV === 'development';