Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(utils): getFileCommitDate should support log.showSignature=true #10022

Merged
merged 3 commits into from
Apr 5, 2024
Merged

fix(utils): getFileCommitDate should support log.showSignature=true #10022

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f42e98e
fix getFileCommitDate when options display signature
slorber Apr 5, 2024
f3b364b
fix getFileCommitDate when options display signature
slorber Apr 5, 2024
1cea63a
Add useful comments
slorber Apr 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions packages/docusaurus-utils/src/gitUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,21 +107,26 @@
);
}

const format = includeAuthor ? 'RESULT:%ct,%an' : 'RESULT:%ct';
const args = [
`--format=%ct${includeAuthor ? ',%an' : ''}`,
`--format=${format}`,
'--max-count=1',
age === 'oldest' ? '--follow --diff-filter=A' : undefined,
]
.filter(Boolean)
.join(' ');

const command = `git -c log.showSignature=false log ${args} -- "${path.basename(
file,
)}"`;

const result = await new Promise<{
code: number;
stdout: string;
stderr: string;
}>((resolve) => {
shell.exec(
`git log ${args} -- "${path.basename(file)}"`,
command,
{
// Setting cwd is important, see: https://github.com/facebook/docusaurus/pull/5048
cwd: path.dirname(file),
Expand All @@ -138,10 +143,10 @@
`Failed to retrieve the git history for file "${file}" with exit code ${result.code}: ${result.stderr}`,
);
}
let regex = /^(?<timestamp>\d+)$/;
if (includeAuthor) {
regex = /^(?<timestamp>\d+),(?<author>.+)$/;
}

const regex = includeAuthor
? /(?:^|\n)RESULT:(?<timestamp>\d+),(?<author>.+)(?:$|\n)/
: /(?:^|\n)RESULT:(?<timestamp>\d+)(?:$|\n)/;

const output = result.stdout.trim();

Expand Down
Loading