Refactor CatFile batch implementation and introduce batch-command for git 2.36 #34651
+503
−198
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lunny
added
the
type/refactoring
GiteaBot
added
the
lgtm/need 2
lunny
force-pushed
the
lunny/catfile_batch_refactor
branch
from
f0b6480 to
334eb9e
Compare
… into lunny/catfile_batch_refactor
Zettat123
approved these changes
Oct 20, 2025
GiteaBot
removed
the
lgtm/need 2
GiteaBot
added
the
lgtm/need 1
wxiaoguang
reviewed
Oct 20, 2025
modules/git/gitcmd/command.go
Outdated
Comment on lines
188
to
193
| // ToTrustCmdArg converts a string (trusted as argument) to CmdArg | ||
| // In most cases, it shouldn't be used. Use AddXxx function instead | ||
| func ToTrustCmdArg(arg string) internal.CmdArg { | ||
| return internal.CmdArg(arg) | ||
| } | ||
|
|
wxiaoguang
reviewed
Oct 20, 2025
Comment on lines
+155
to
+159
| func NewBatch(ctx context.Context, repoPath string) (Batch, error) { | ||
| if DefaultFeatures().SupportCatFileBatchCommand { | ||
| return newBatchCommandCatFile(ctx, repoPath) | ||
| } | ||
| return newBatchCatFileWithCheck(ctx, repoPath) |
There was a problem hiding this comment.
I believe it is not the first time that I told you that you must have correct tests
wxiaoguang
reviewed
Oct 22, 2025
wxiaoguang
reviewed
Oct 22, 2025
| @@ -0,0 +1 @@ | |||
| ref: refs/heads/master | |||
There was a problem hiding this comment.
I don't understand why it needs a new git repo for testing purpose. There are already plenty.
There was a problem hiding this comment.
This is for lfs test. There is no test repository for lfs under git/tests.
There was a problem hiding this comment.
Why it must be under git/tests?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
For git version 2.36,
git cat-file --batch-commandwas introduced which can replacegit cat-file --batchandgit cat-file --batch-check.This PR implements an abstract layer for the batch commands so that both git 2.36 and lower version git can work.
If git version is lower than 2.36, it will start two subprocesses
git cat-file --batchandgit cat-file --batch-check.If git version is greater than 2.36, only
git cat-file --batch-commandwill be started.This reduced half of child processes of git catfiles.