refactor: simplify ParseCatFileTreeLine and catBatchParseTreeEntries#37210
Merged
Conversation
Replace the manual switch statement for mode parsing with a call to ParseEntryMode, which already handles all the same cases including edge cases like "40755" via its fallback logic. Co-Authored-By: GitHub Copilot <copilot@github.com> Agent-Logs-Url: https://github.com/go-gitea/gitea/sessions/c93c0d76-8a70-478f-a549-2f120c5f45c4 Co-authored-by: wxiaoguang <2114189+wxiaoguang@users.noreply.github.com>
…pre-provided buffers
Replace the three caller-provided buffer parameters (modeBuf, fnameBuf, shaBuf)
with internal allocation. Use rd.ReadBytes('\x00') to read mode+fname in one
call and slice the result directly. Allocate sha internally. Update both callers
(catBatchParseTreeEntries and lfs_nogogit.go) to drop the buffer setup.
Co-Authored-By: GitHub Copilot <copilot@github.com>
Agent-Logs-Url: https://github.com/go-gitea/gitea/sessions/43dab9a5-8c12-41c7-8da6-77c268a65ada
Co-authored-by: wxiaoguang <2114189+wxiaoguang@users.noreply.github.com>
…safe slices Co-Authored-By: GitHub Copilot <copilot@github.com> Agent-Logs-Url: https://github.com/go-gitea/gitea/sessions/43dab9a5-8c12-41c7-8da6-77c268a65ada Co-authored-by: wxiaoguang <2114189+wxiaoguang@users.noreply.github.com>
Copilot created this pull request from a session on behalf of
wxiaoguang
April 14, 2026 06:52
View session
GiteaBot
added
the
lgtm/need 2
Contributor
There was a problem hiding this comment.
Pull request overview
This PR refactors Git tree-entry parsing in the cat-file --batch pipeline to simplify ParseCatFileTreeLine, centralize mode parsing via ParseEntryMode, and update downstream consumers to use the new return types.
Changes:
- Expand
ParseEntryModeto accept tree modes with/without a leading zero ("040000"and"40000"). - Refactor
ParseCatFileTreeLineto returnEntryMode,name string, andObjectID, with updated buffering behavior for long names. - Update tree parsing and LFS scanning to use the new
ParseCatFileTreeLinesignature and typed results.
Reviewed changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
| modules/git/tree_entry_mode.go | Accept non-zero-padded tree mode string and rely on shared mode parsing logic. |
| modules/git/pipeline/lfs_nogogit.go | Adapt LFS scan logic to new tree-line parser outputs (typed mode + ObjectID). |
| modules/git/parse_treeentry.go | Simplify cat-file tree entry parsing by using EntryMode and ObjectID directly. |
| modules/git/catfile_batch_reader.go | Major refactor of ParseCatFileTreeLine API and implementation, including buffer handling changes. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
wxiaoguang
approved these changes
Apr 14, 2026
GiteaBot
added
lgtm/need 1
wxiaoguang
added
the
type/refactoring
silverwind
reviewed
Apr 14, 2026
silverwind
approved these changes
Apr 14, 2026
GiteaBot
added
lgtm/done
zjjhot
added a commit
to zjjhot/gitea
that referenced
this pull request
Apr 17, 2026
* main: Replace `dropzone` with `@deltablot/dropzone` (go-gitea#37237) Add `ExternalIDClaim` option for OAuth2 OIDC auth source (go-gitea#37229) Remove error returns from crypto random helpers and callers (go-gitea#37240) Use Content-Security-Policy: script nonce (go-gitea#37232) Remove htmx (go-gitea#37224) Refactor "htmx" to "fetch action" (go-gitea#37208) Fix UI regression (go-gitea#37218) Fix corrupted JSON caused by goccy library (go-gitea#37214) Add test for "fetch redirect", add CSS value validation for external render (go-gitea#37207) Fix incorrect concurrency check (go-gitea#37205) refactor: simplify ParseCatFileTreeLine and catBatchParseTreeEntries (go-gitea#37210) Update go js py dependencies (go-gitea#37204)
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Simplify ParseCatFileTreeLine: it is faster without the preset buffers, and easier to read and maintain.