diff --git a/extensions/git/src/api/git.d.ts b/extensions/git/src/api/git.d.ts index c688a4444278eeb47e5a858b8ff87d9d22ba5b5d..e1efe1299fce0aef920f6c363847111a1a5b2352 100644 --- a/extensions/git/src/api/git.d.ts +++ b/extensions/git/src/api/git.d.ts @@ -44,7 +44,6 @@ export interface Commit { readonly authorDate?: Date; readonly authorName?: string; readonly authorEmail?: string; - readonly commitDate?: Date; } export interface Submodule { diff --git a/extensions/git/src/git.ts b/extensions/git/src/git.ts index 89206132470ce61097b09ff590ff1d21362572b1..4453c8a802794c10ac0a98fd56b34db7d50e9378 100644 --- a/extensions/git/src/git.ts +++ b/extensions/git/src/git.ts @@ -333,7 +333,7 @@ function sanitizePath(path: string): string { return path.replace(/^([a-z]):\\/i, (_, letter) => `${letter.toUpperCase()}:\\`); } -const COMMIT_FORMAT = '%H%n%aN%n%aE%n%at%n%ct%n%P%n%B'; +const COMMIT_FORMAT = '%H%n%aN%n%aE%n%at%n%P%n%B'; export class Git { @@ -525,7 +525,6 @@ export interface Commit { authorDate?: Date; authorName?: string; authorEmail?: string; - commitDate?: Date; } export class GitStatusParser { @@ -656,16 +655,15 @@ export function parseGitmodules(raw: string): Submodule[] { return result; } -const commitRegex = /([0-9a-f]{40})\n(.*)\n(.*)\n(.*)\n(.*)\n(.*)(?:\n([^]*?))?(?:\x00)/gm; +const commitRegex = /([0-9a-f]{40})\n(.*)\n(.*)\n(.*)\n(.*)(?:\n([^]*?))?(?:\x00)/gm; export function parseGitCommits(data: string): Commit[] { let commits: Commit[] = []; let ref; - let authorName; - let authorEmail; - let authorDate; - let commitDate; + let name; + let email; + let date; let parents; let message; let match; @@ -676,7 +674,7 @@ export function parseGitCommits(data: string): Commit[] { break; } - [, ref, authorName, authorEmail, authorDate, commitDate, parents, message] = match; + [, ref, name, email, date, parents, message] = match; if (message[message.length - 1] === '\n') { message = message.substr(0, message.length - 1); @@ -687,10 +685,9 @@ export function parseGitCommits(data: string): Commit[] { hash: ` ${ref}`.substr(1), message: ` ${message}`.substr(1), parents: parents ? parents.split(' ') : [], - authorDate: new Date(Number(authorDate) * 1000), - authorName: ` ${authorName}`.substr(1), - authorEmail: ` ${authorEmail}`.substr(1), - commitDate: new Date(Number(commitDate) * 1000), + authorDate: new Date(Number(date) * 1000), + authorName: ` ${name}`.substr(1), + authorEmail: ` ${email}`.substr(1) }); } while (true);