clean up

Author: wxiaoguang

modules/git/batch.go

@@ -8,9 +8,13 @@ import (
 	"context"
 )
 
-type CatFileBatch interface {
+type CatFileBatchQueryContent interface {
 	QueryContent([]byte) (int, error)
 	ContentReader() *bufio.Reader
+}
+
+type CatFileBatch interface {
+	CatFileBatchQueryContent
 
 	QueryInfo([]byte) (int, error)
 	InfoReader() *bufio.Reader

modules/git/batch_reader.go

@@ -45,6 +45,7 @@ func (b *catFileBatchCommunicator) Close() {
 // This is needed otherwise the git cat-file will hang for invalid repositories.
 // FIXME: the comment is from https://github.com/go-gitea/gitea/pull/17991 but it doesn't seem to be true.
 // The real problem is that Golang's Cmd.Wait hangs because it waits for the pipes to be closed, but we can't close the pipes before Wait returns
+// Need to refactor to use StdinPipe and StdoutPipe
 func ensureValidGitRepository(ctx context.Context, repoPath string) error {
 	stderr := strings.Builder{}
 	err := gitcmd.NewCommand("rev-parse").

modules/git/repo_commit_nogogit.go

@@ -71,10 +71,10 @@ func (repo *Repository) getCommit(id ObjectID) (*Commit, error) {
 
 	_, _ = batch.QueryContent([]byte(id.String() + "\n"))
 
-	return repo.getCommitFromBatchReader(batch, id)
+	return repo.getCommitFromBatchContentReader(batch, id)
 }
 
-func (repo *Repository) getCommitFromBatchReader(batch CatFileBatch, id ObjectID) (*Commit, error) {
+func (repo *Repository) getCommitFromBatchContentReader(batch CatFileBatchQueryContent, id ObjectID) (*Commit, error) {
 	_, typ, size, err := ReadBatchLine(batch.ContentReader())
 	if err != nil {
 		if errors.Is(err, io.EOF) || IsErrNotExist(err) {
@@ -106,7 +106,7 @@ func (repo *Repository) getCommitFromBatchReader(batch CatFileBatch, id ObjectID
 			return nil, err
 		}
 
-		commit, err := repo.getCommitFromBatchReader(batch, tag.Object)
+		commit, err := repo.getCommitFromBatchContentReader(batch, tag.Object)
 		if err != nil {
 			return nil, err
 		}

modules/git/repo_tree_nogogit.go

@@ -41,7 +41,7 @@ func (repo *Repository) getTree(id ObjectID) (*Tree, error) {
 		if _, err := batch.QueryContent([]byte(tag.Object.String() + "\n")); err != nil {
 			return nil, err
 		}
-		commit, err := repo.getCommitFromBatchReader(batch, tag.Object)
+		commit, err := repo.getCommitFromBatchContentReader(batch, tag.Object)
 		if err != nil {
 			return nil, err
 		}