mirror of
https://github.com/Microsoft/vscode
synced 2024-08-27 04:49:35 +00:00
Git - only add --diff-merges if flag is supported (#200954)
This commit is contained in:
parent
1b27c60b38
commit
81546fb355
|
@ -1049,7 +1049,11 @@ export class Repository {
|
||||||
const args = ['log', `--format=${COMMIT_FORMAT}`, '-z'];
|
const args = ['log', `--format=${COMMIT_FORMAT}`, '-z'];
|
||||||
|
|
||||||
if (options?.shortStats) {
|
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) {
|
if (options?.reverse) {
|
||||||
|
|
Loading…
Reference in a new issue