Some refactors about GetMergeBase by lunny · Pull Request #36186 · go-gitea/gitea

lunny · 2025-12-18T04:29:24Z

Maybe fix #32018

Use gitrepo.GetMergeBase method instead of other two implementations.
Add FetchRemoteCommit so that we don't need to add many remote to the git repository to avoid possible git lock conflicts. A lock will start when invoke the function, it will be invoked when cross-repository comparing. The head repository will fetch the base repository's base commit id. In most situations, it should lock the fork repositories so that it should not become a bottleneck.
Improve GetCompareInfo to remove unnecessarily adding remote.
Remove unnecessary parameters of SignMerge.

extract from #36186

wxiaoguang · 2026-01-13T02:29:05Z

CI failure is also related.

Do rerun the CI multiple times before merge to ensure there is no regression.

CI failure is still related

     pull_create_test.go:98: 
        	Error Trace:	/home/runner/work/gitea/gitea/tests/integration/integration_test.go:348
        	            				/home/runner/work/gitea/gitea/tests/integration/integration_test.go:160
        	            				/home/runner/work/gitea/gitea/tests/integration/pull_create_test.go:98
        	            				/home/runner/work/gitea/gitea/tests/integration/pull_create_test.go:399
        	            				/opt/hostedtoolcache/go/1.25.5/x64/src/sync/waitgroup.go:239
        	            				/opt/hostedtoolcache/go/1.25.5/x64/src/runtime/asm_amd64.s:1693
        	Error:      	Not equal: 
        	            	expected: 200
        	            	actual  : 500
        	Test:       	TestPullCreateParallel
        	Messages:   	Request: GET /user2/repo1/compare/master...user1/repo1:new-branch-3


    pull_create_test.go:416: 
        	Error Trace:	/home/runner/work/gitea/gitea/tests/integration/pull_create_test.go:416
        	            				/home/runner/work/gitea/gitea/tests/integration/git_helper_for_declarative_test.go:88
        	            				/home/runner/work/gitea/gitea/tests/integration/pull_create_test.go:384
        	Error:      	Not equal: 
        	            	expected: 8
        	            	actual  : 7
        	Test:       	TestPullCreateParallel
    pull_create_test.go:417: 
        	Error Trace:	/home/runner/work/gitea/gitea/tests/integration/pull_create_test.go:417
        	            				/home/runner/work/gitea/gitea/tests/integration/git_helper_for_declarative_test.go:88
        	            				/home/runner/work/gitea/gitea/tests/integration/pull_create_test.go:384
        	Error:      	Not equal: 
        	            	expected: 8
        	            	actual  : 7
        	Test:       	TestPullCreateParallel

…nny/some_refactors

lunny · 2026-01-16T19:47:58Z

CI failure is also related.

Do rerun the CI multiple times before merge to ensure there is no regression.

Added a lock for the fetch operations to the repository and rerun the CI many times and all PASS.

* giteaofficial/main: (27 commits) Allow foreachref parse max tokens from 4*64KB to 4MB (go-gitea#36414) Refactor git command context & pipeline (go-gitea#36406) Fix missing repository id when migrating release attachments (go-gitea#36389) [skip ci] Updated translations via Crowdin Refactor git command stderr handling (go-gitea#36402) Some refactors about GetMergeBase (go-gitea#36186) Refactor git command stdio pipe (go-gitea#36393) fix: typos in comments (go-gitea#36394) add support for archive-upload rpc (go-gitea#36391) Hide delete directory button for mirror or archive repository and disable the menu item if user have no permission (go-gitea#36384) Fix CODEOWNERS review request attribution using comment metadata (go-gitea#36348) Update JS and PY deps (go-gitea#36383) Add ability to download subpath archive (go-gitea#36371) Fix bug on notification read (go-gitea#36339) Add chunked transfer encoding support for LFS uploads (go-gitea#36380) Migrate to `import.meta.env` and clean up types and eslint (go-gitea#36362) Rename CSS variables and improve colorblind themes (go-gitea#36353) Indicate when only optional checks failed (go-gitea#36367) Release attachments must belong to the intended repo (go-gitea#36347) Fix permission check on org project operations (go-gitea#36318) ...

# This is the 1st commit message: feat: Add max-parallel implementation inside the Gitea server # This is the commit message go-gitea#2: fix: Remove MatrixID and Capacity functionality # This is the commit message go-gitea#3: Fix incorrect text content detection (go-gitea#36364) Fix go-gitea#36325 # This is the commit message go-gitea#4: clean watches when make a repository private and check permission when send release emails (go-gitea#36319) # This is the commit message go-gitea#5: Fix bug when compare in the pull request (go-gitea#36363) The pull request comparison should not use `direct compare`. # This is the commit message go-gitea#6: Fix permission check on org project operations (go-gitea#36318) # This is the commit message go-gitea#7: Release attachments must belong to the intended repo (go-gitea#36347) # This is the commit message go-gitea#8: Indicate when only optional checks failed (go-gitea#36367) Currently it's not clear that you can merge a PR when only optional checks failed: <img width="922" height="447" alt="Screenshot 2026-01-14 at 4 08 17 pm" src="https://github.com/user-attachments/assets/e11670c7-5ab9-42d7-af09-2d8a8fd532d3" /> This PR changes the text to say "Some optional checks failed" when only optional checks failed: <img width="922" height="443" alt="Screenshot 2026-01-14 at 3 59 08 pm" src="https://github.com/user-attachments/assets/9ea69b13-38d6-4cfc-b4f7-952eff58e546" /> When a required check fails it'll still say "Some checks failed": <img width="928" height="343" alt="Screenshot 2026-01-14 at 3 59 20 pm" src="https://github.com/user-attachments/assets/d3764a95-9737-4482-851e-d3406b1e4d76" /> --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com> # This is the commit message go-gitea#9: Rename CSS variables and improve colorblind themes (go-gitea#36353) Followup go-gitea#36215, rename the variables for consistency with existing vars and change green to value of `--color-blue` in the relevant color blind themes: <img width="1305" height="303" alt="image" src="https://github.com/user-attachments/assets/3d131ab7-99ab-4b03-93ab-715ce0030b08" /> The blue coloring also matched GitHub: <img width="1313" height="393" alt="image" src="https://github.com/user-attachments/assets/f97e35b2-4ff4-49b0-841f-ffd49a02e03d" /> --------- Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> # This is the commit message go-gitea#10: Migrate to `import.meta.env` and clean up types and eslint (go-gitea#36362) `import.meta.env` is supported in both vitest and webpack [as of recent](webpack/webpack#19996), so replace all previous use of `process.env` with it. Current usage is limited to test files, I've also verified it works in actual frontend code. `webpack/module` is added to typescript types which includes the definition for `import.meta.env`. I've also made the eslint globals more precise. Finally, `__webpack_public_path__` is removed from our type definitions because `webpack/module` also provides it. # This is the commit message go-gitea#11: Add chunked transfer encoding support for LFS uploads (go-gitea#36380) Enable chunked transfer encoding for Git LFS uploads by adding Transfer-Encoding: chunked header to upload action responses. This prevents large file uploads (100+ MB) from being blocked by reverse proxies like Cloudflare that buffer non-chunked requests. Fix go-gitea#22233 --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com> # This is the commit message go-gitea#12: Fix bug on notification read (go-gitea#36339) When a user has been revoked permission to access a repository, the related notification could still be visited. But the repository's information should not be leaked any more. # This is the commit message go-gitea#13: Add ability to download subpath archive (go-gitea#36371) closes: go-gitea#4478 --------- Signed-off-by: wxiaoguang <wxiaoguang@gmail.com> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com> # This is the commit message go-gitea#14: Update JS and PY deps (go-gitea#36383) - Update JS and PY dependencies - Workaround stylelint/stylelint#8893 by moving the stylint config file to JS - Regenerate SVGs - Bump to python 3.14 in devcontainer and actions - Verified `@github/text-expander-element` - Removed obsolete type stub # This is the commit message go-gitea#15: Fix CODEOWNERS review request attribution using comment metadata (go-gitea#36348) Fixes go-gitea#36333 ## Problem When CODEOWNERS automatically assigns reviewers to a pull request, the timeline incorrectly shows the PR author as the one who requested the review (e.g., "PR_AUTHOR requested review from CODE_OWNER"). This is misleading since the action was triggered automatically by CODEOWNERS rules, not by the PR author. ## Solution Store CODEOWNERS attribution in comment metadata instead of changing the doer user: - Add `SpecialDoerName` field to `CommentMetaData` struct (value: `"CODEOWNERS"` for CODEOWNERS-triggered requests) - Pass `isCodeOwners=true` to `AddReviewRequest` and `AddTeamReviewRequest` functions - Template can check this metadata to show appropriate attribution message --------- Signed-off-by: wxiaoguang <wxiaoguang@gmail.com> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com> # This is the commit message go-gitea#16: Hide delete directory button for mirror or archive repository and disable the menu item if user have no permission (go-gitea#36384) # This is the commit message go-gitea#17: add support for archive-upload rpc (go-gitea#36391) Add support for fetching archives with `git archive --remote <repo-url>` closes: go-gitea#23425 --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com> # This is the commit message go-gitea#18: fix: typos in comments (go-gitea#36394) # This is the commit message go-gitea#19: Refactor git command stdio pipe (go-gitea#36393) And remove the incorrect `ensureValidGitRepository` # This is the commit message go-gitea#20: Some refactors about GetMergeBase (go-gitea#36186) Maybe fix go-gitea#32018 - Use `gitrepo.GetMergeBase` method instead of other two implementations. - Add `FetchRemoteCommit` so that we don't need to add many `remote` to the git repository to avoid possible git lock conflicts. A lock will start when invoke the function, it will be invoked when cross-repository comparing. The head repository will fetch the base repository's base commit id. In most situations, it should lock the fork repositories so that it should not become a bottleneck. - Improve `GetCompareInfo` to remove unnecessarily adding remote. - Remove unnecessary parameters of `SignMerge`. # This is the commit message go-gitea#21: Refactor git command stderr handling (go-gitea#36402) And clean up legacy fragile & incorrect logic # This is the commit message go-gitea#22: [skip ci] Updated translations via Crowdin # This is the commit message go-gitea#23: Fix missing repository id when migrating release attachments (go-gitea#36389) This PR fixes missed repo_id on the migration of attachments to Gitea. It also provides a doctor check to fix the dirty data on the database. Refactor git command context & pipeline (go-gitea#36406) Less and simpler code, fewer bugs Allow foreachref parse max tokens from 4*64KB to 4MB (go-gitea#36414) Fix go-gitea#36408 --------- Signed-off-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: Lauris BH <lauris@nix.lv> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com> Update material-icon-theme to v5.31.0 (go-gitea#36427) Update chroma to v2.23.0 (go-gitea#36423) Fix markdown newline handling during IME composition (go-gitea#36421) ### Summary Fix incorrect newline handling in markdown editor when using IME input. ### Details While composing text with an IME, pressing Enter should not trigger markdown indentation logic. This change skips indentation handling during composition by checking `e.isComposing`. This prevents unexpected line breaks and formatting issues for CJK users. [skip ci] Updated translations via Crowdin Fix typos: unknow -> unknown, pktLineTypeUnknow -> pktLineTypeUnknown (go-gitea#36419) Fix issue filter menu layout (go-gitea#36426) Fix go-gitea#36420 Fix spelling (go-gitea#36399) Signed-off-by: Thomas Beutlich <115483027+thbeu@users.noreply.github.com> Refactor git command stdio pipe (go-gitea#36422) Most potential deadlock problems should have been fixed, and new code is unlikely to cause new problems with the new design. Also raise the minimum Git version required to 2.6.0 (released in 2015) Remove `node-check` and `go-check`, support node prerelease versions (go-gitea#36382) 1. Remove those checks for the sake of build performance and because go and node will fail anyways if their versions are incorrect. 3. Support pre-release Node version for determining NODE_VARS. 2. Update to the chinese READMEs to mention `pnpm` which is already present in english README. --------- Co-authored-by: techknowlogick <techknowlogick@gitea.com> Co-authored-by: Giteabot <teabot@gitea.io> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com> fix: Adjust the unittests fix: Lint issues fix: Adjust the swagger config

Some refactors to reduce RepoPath

47f6f1d

lunny added the type/refactoring Existing code has been cleaned up. There should be no new functionality. label Dec 18, 2025

GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Dec 18, 2025

github-actions bot added the modifies/go Pull requests that update Go code label Dec 18, 2025

lunny added 6 commits December 17, 2025 20:52

Use new MergeBase method

e5fe093

Fix bug

7228fb1

Fix bug

b4df643

Merge branch 'main' into lunny/some_refactors

0394fca

Fix lint

10d4361

Fix bug

5e85f8c

lunny marked this pull request as draft December 25, 2025 07:19

lunny mentioned this pull request Dec 26, 2025

Use gitrepo's push function #36245

Merged

lafriks pushed a commit that referenced this pull request Dec 28, 2025

Use gitrepo's push function (#36245)

c7b3cdf

extract from #36186

Merge branch 'main' into lunny/some_refactors

73279fb

lunny changed the title ~~Some refactors to reduce RepoPath~~ Some refactors about GetMergeBase Dec 29, 2025

lunny added 6 commits December 29, 2025 12:16

Merge branch 'main' into lunny/some_refactors

d3fb475

Fix lint

5bf1c50

improvement

68bb751

remove unused code

500fbe2

Merge branch 'main' into lunny/some_refactors

f9d77d7

Fix some bugs

bda42c5

github-actions bot added the modifies/api This PR adds API routes or modifies them label Jan 3, 2026

lunny marked this pull request as ready for review January 3, 2026 04:40

Zettat123 approved these changes Jan 3, 2026

View reviewed changes

GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Jan 3, 2026

lafriks approved these changes Jan 4, 2026

View reviewed changes

GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Jan 4, 2026

Merge branch 'main' into lunny/some_refactors

f2a69d8

lunny added 2 commits January 12, 2026 12:23

Merge branch 'main' into lunny/some_refactors

81dacb1

Merge branch 'main' into lunny/some_refactors

e809347

lunny added 4 commits January 13, 2026 17:20

Fix parally problem

791bd43

Merge branch 'lunny/some_refactors' of github.com:lunny/gitea into lu…

e4a5681

…nny/some_refactors

test

75c62ce

Merge branch 'main' into lunny/some_refactors

733c5b6

github-actions bot removed the modifies/api This PR adds API routes or modifies them label Jan 14, 2026

lunny added 7 commits January 14, 2026 11:40

Merge branch 'main' into lunny/some_refactors

9f1434b

Merge branch 'main' into lunny/some_refactors

a1adabe

Merge branch 'main' into lunny/some_refactors

862dd47

Merge branch 'main' into lunny/some_refactors

ba6d874

Merge branch 'main' into lunny/some_refactors

d61c3b1

Merge branch 'main' into lunny/some_refactors

5eb5ec9

Merge branch 'main' into lunny/some_refactors

2cbd55f

Merge branch 'main' into lunny/some_refactors

20a7675

lunny marked this pull request as ready for review January 17, 2026 05:12

lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jan 17, 2026

GiteaBot and others added 4 commits January 17, 2026 23:17

Merge branch 'main' into lunny/some_refactors

d4433f6

Merge branch 'main' into lunny/some_refactors

0a6b159

Merge branch 'main' into lunny/some_refactors

19ca3cb

Fix merge error

f649d09

lunny merged commit fafd1db into go-gitea:main Jan 17, 2026
24 checks passed

GiteaBot added this to the 1.26.0 milestone Jan 17, 2026

lunny deleted the lunny/some_refactors branch January 17, 2026 19:22

GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jan 17, 2026

tyroneyeh mentioned this pull request Jan 29, 2026

Regression: PR commits list includes unrelated commits after fafd1db1 #36483

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Some refactors about GetMergeBase#36186

Some refactors about GetMergeBase#36186
lunny merged 39 commits intogo-gitea:mainfrom
lunny:lunny/some_refactors

lunny commented Dec 18, 2025 •

edited

Loading

Uh oh!

wxiaoguang commented Jan 13, 2026

Uh oh!

lunny commented Jan 16, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Uh oh!

Conversation

lunny commented Dec 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wxiaoguang commented Jan 13, 2026

Uh oh!

lunny commented Jan 16, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

lunny commented Dec 18, 2025 •

edited

Loading