Make sure git version&feature are always prepared (#30877)

Otherwise there would be more similar issues like #29287
This commit is contained in:
wxiaoguang 2024-05-07 00:34:16 +08:00 committed by GitHub
parent 8e8ca6c653
commit 7c613f100e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
28 changed files with 116 additions and 146 deletions

View file

@ -1143,7 +1143,7 @@ func GetDiff(ctx context.Context, gitRepo *git.Repository, opts *DiffOptions, fi
// so if we are using at least this version of git we don't have to tell ParsePatch to do
// the skipping for us
parsePatchSkipToFile := opts.SkipTo
if opts.SkipTo != "" && git.CheckGitVersionAtLeast("2.31") == nil {
if opts.SkipTo != "" && git.DefaultFeatures().CheckVersionAtLeast("2.31") {
cmdDiff.AddOptionFormat("--skip-to=%s", opts.SkipTo)
parsePatchSkipToFile = ""
}