Merge pull request #90398 from microsoft/eamodio/1.42-recovery

Fixes #90229
microsoft · Feb 11, 2020 · c47d83b · c47d83b
2 parents afe8e18 + 7e8d5b0
commit c47d83b
Showing 1 changed file with 4 additions and 4 deletions.
diff --git 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%P\n%B';
+const COMMIT_FORMAT = '%H%n%aN%n%aE%n%at%n%P%n%B';
 
 export class Git {
 
@@ -809,8 +809,8 @@ export class Repository {
 	}
 
 	async log(options?: LogOptions): Promise<Commit[]> {
-		const maxEntries = options && typeof options.maxEntries === 'number' && options.maxEntries > 0 ? options.maxEntries : 32;
-		const args = ['log', '-' + maxEntries, `--format:${COMMIT_FORMAT}`, '-z'];
+		const maxEntries = options?.maxEntries ?? 32;
+		const args = ['log', `-n${maxEntries}`, `--format=${COMMIT_FORMAT}`, '-z', '--'];
 
 		const result = await this.run(args);
 		if (result.exitCode) {
@@ -823,7 +823,7 @@ export class Repository {
 
 	async logFile(uri: Uri, options?: LogFileOptions): Promise<Commit[]> {
 		const maxEntries = options?.maxEntries ?? 32;
-		const args = ['log', `-${maxEntries}`, `--format=${COMMIT_FORMAT}`, '-z', '--', uri.fsPath];
+		const args = ['log', `-n${maxEntries}`, `--format=${COMMIT_FORMAT}`, '-z', '--', uri.fsPath];
 
 		const result = await this.run(args);
 		if (result.exitCode) {