Skip to content

Improve submodule relative path handling (#35056) #35075

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 3 commits into from
Jul 14, 2025
Merged

Improve submodule relative path handling (#35056) #35075

merged 3 commits into from
Jul 14, 2025

Conversation

@wxiaoguang
Copy link
Contributor

Backport #35056

wxiaoguang and others added 2 commits July 14, 2025 23:29
@wxiaoguang @GiteaBot
Improve submodule relative path handling (go-gitea#35056)
f3c00ff 
Fix go-gitea#35054

---------

Co-authored-by: Giteabot <[email protected]>
# Conflicts:
#	routers/web/repo/wiki.go
@wxiaoguang
fix merge
7e1abbe
@GiteaBot GiteaBot added this to the 1.24.3 milestone Jul 14, 2025
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jul 14, 2025
@github-actions github-actions bot added modifies/go Pull requests that update Go code modifies/templates This PR modifies the template files labels Jul 14, 2025
@wxiaoguang
Copy link
Contributor Author

Tested related pages:

  • home
  • file list
  • compare (diff)

@GiteaBot 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 Jul 14, 2025
@GiteaBot 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 Jul 14, 2025
@lunny lunny enabled auto-merge (squash) July 14, 2025 17:01
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jul 14, 2025
@lunny lunny merged commit 12bfa9e into go-gitea:release/v1.24 Jul 14, 2025
26 checks passed
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jul 14, 2025
@wxiaoguang wxiaoguang deleted the fix-submodule-1.24 branch July 15, 2025 00:06
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Oct 12, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@lunny lunny lunny approved these changes

+1 more reviewer

@hiifong hiifong hiifong approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/docs modifies/go Pull requests that update Go code modifies/templates This PR modifies the template files

Projects

None yet

Milestone

1.24.3

Development

Successfully merging this pull request may close these issues.

4 participants

@wxiaoguang @lunny @hiifong @GiteaBot