Skip to content

Improve submodule relative path handling #35056

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 7 commits into from
Jul 14, 2025
Merged

Improve submodule relative path handling #35056

merged 7 commits into from
Jul 14, 2025
+98 −102

Conversation

wxiaoguang
Copy link
Contributor

Fix #35054

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jul 12, 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 12, 2025
This was referenced Jul 12, 2025
Closed
Merged
@wxiaoguang wxiaoguang added this to the 1.25.0 milestone Jul 12, 2025
@wxiaoguang wxiaoguang added the type/enhancement An improvement of existing functionality label Jul 12, 2025
@wxiaoguang wxiaoguang changed the title Fix submodule relative path handling Improve submodule relative path handling Jul 12, 2025
@wxiaoguang wxiaoguang force-pushed the fix-submodule-relpath branch 2 times, most recently from 0219371 to 88b857c Compare July 12, 2025 02:52
@wxiaoguang wxiaoguang force-pushed the fix-submodule-relpath branch from 88b857c to 7e4db07 Compare July 12, 2025 07:10
@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 12, 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 13, 2025
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jul 13, 2025
@wxiaoguang wxiaoguang mentioned this pull request Jul 14, 2025
Closed
@wxiaoguang wxiaoguang added the backport/v1.24 This PR should be backported to Gitea 1.24 label Jul 14, 2025
@wxiaoguang wxiaoguang merged commit d084598 into go-gitea:main Jul 14, 2025
26 checks passed
@GiteaBot
Copy link
Collaborator

I was unable to create a backport for 1.24. @wxiaoguang, please send one manually. 🍵

go run ./contrib/backport 35056
...  // fix git conflicts if any
go run ./contrib/backport --continue

@wxiaoguang wxiaoguang deleted the fix-submodule-relpath branch July 14, 2025 15:28
@GiteaBot GiteaBot added backport/manual No power to the bots! Create your backport yourself! and removed reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels Jul 14, 2025
wxiaoguang added a commit to wxiaoguang/gitea that referenced this pull request Jul 14, 2025
@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 wxiaoguang mentioned this pull request Jul 14, 2025
Merged
@wxiaoguang wxiaoguang added the backport/done All backports for this PR have been created label Jul 14, 2025
lunny pushed a commit that referenced this pull request Jul 14, 2025
@wxiaoguang
Improve submodule relative path handling (#35056) (#35075)
12bfa9e 
Backport #35056
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lunny lunny lunny approved these changes

@hiifong hiifong hiifong approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created backport/manual No power to the bots! Create your backport yourself! backport/v1.24 This PR should be backported to Gitea 1.24 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/go Pull requests that update Go code modifies/templates This PR modifies the template files type/enhancement An improvement of existing functionality
Projects
None yet
Milestone
1.25.0
Development

Successfully merging this pull request may close these issues.

relative submodule PR diff links not working
4 participants
@wxiaoguang @GiteaBot @lunny @hiifong