remove unnecessary duplicate code (#34733)

This commit is contained in:
Lunny Xiao
2025-06-18 00:23:56 +08:00
committed by GitHub
parent 037f72bdb3
commit 1e644e39f9

View File

@ -7,8 +7,6 @@ package git
import ( import (
"context" "context"
"fmt"
"io"
"path" "path"
"sort" "sort"
@ -124,48 +122,25 @@ func GetLastCommitForPaths(ctx context.Context, commit *Commit, treePath string,
return nil, err return nil, err
} }
batchStdinWriter, batchReader, cancel, err := commit.repo.CatFileBatch(ctx)
if err != nil {
return nil, err
}
defer cancel()
commitsMap := map[string]*Commit{} commitsMap := map[string]*Commit{}
commitsMap[commit.ID.String()] = commit commitsMap[commit.ID.String()] = commit
commitCommits := map[string]*Commit{} commitCommits := map[string]*Commit{}
for path, commitID := range revs { for path, commitID := range revs {
if len(commitID) == 0 {
continue
}
c, ok := commitsMap[commitID] c, ok := commitsMap[commitID]
if ok { if ok {
commitCommits[path] = c commitCommits[path] = c
continue continue
} }
if len(commitID) == 0 { c, err := commit.repo.GetCommit(commitID) // Ensure the commit exists in the repository
continue
}
_, err := batchStdinWriter.Write([]byte(commitID + "\n"))
if err != nil { if err != nil {
return nil, err return nil, err
} }
_, typ, size, err := ReadBatchLine(batchReader)
if err != nil {
return nil, err
}
if typ != "commit" {
if err := DiscardFull(batchReader, size+1); err != nil {
return nil, err
}
return nil, fmt.Errorf("unexpected type: %s for commit id: %s", typ, commitID)
}
c, err = CommitFromReader(commit.repo, MustIDFromString(commitID), io.LimitReader(batchReader, size))
if err != nil {
return nil, err
}
if _, err := batchReader.Discard(1); err != nil {
return nil, err
}
commitCommits[path] = c commitCommits[path] = c
} }