development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-07-17 02:57:19 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Git - only add --diff-merges if flag is supported (#200954)

Browse source
This commit is contained in:
Ladislau Szomoru 2023-12-15 14:39:46 +01:00 committed by GitHub
parent 1b27c60b38
commit 81546fb355
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
extensions/git/src/git.ts
View file

@ -1049,7 +1049,11 @@ export class Repository {
const args = ['log', `--format=${COMMIT_FORMAT}`, '-z'];
if (options?.shortStats) {
args.push('--shortstat', '--diff-merges=first-parent');
args.push('--shortstat');
if (this._git.compareGitVersionTo('2.31') !== -1) {
args.push('--diff-merges=first-parent');
}
}
if (options?.reverse) {