Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Make submodule link work with relative path#35034

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.

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

Already on GitHub?Sign in to your account

Merged
wxiaoguang merged 5 commits intogo-gitea:mainfromwxiaoguang:fix-submodule-relpath
Jul 10, 2025

Conversation

@wxiaoguang
Copy link
Contributor

@GiteaBotGiteaBot added the lgtm/need 2This PR needs two approvals by maintainers to be considered for merging. labelJul 10, 2025
@github-actionsgithub-actionsbot added the modifies/goPull requests that update Go code labelJul 10, 2025
@wxiaoguangwxiaoguang added the backport/v1.24This PR should be backported to Gitea 1.24 labelJul 10, 2025
@wxiaoguangwxiaoguang added this to the1.25.0 milestoneJul 10, 2025
@wxiaoguangwxiaoguang added type/bug skip-changelogThis PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. labelsJul 10, 2025
@wxiaoguang
Copy link
ContributorAuthor

Diff with ignoring spaces:https://github.com/go-gitea/gitea/pull/35034/files?w=1

@AdamMajer
Copy link
Contributor

Will this also fix the link in a PR where a submodule is changed?

@wxiaoguang
Copy link
ContributorAuthor

a submodule is changed?

I think yes, they use the same logic.

AdamMajer reacted with thumbs up emoji

@AdamMajer
Copy link
Contributor

https://demo.gitea.com/gnuman/rel_submodule_test/pulls/1/files

This view is still broken. On my test instance with the patch, I see

image
wxiaoguang reacted with eyes emoji

@wxiaoguang
Copy link
ContributorAuthor

https://demo.gitea.com/gnuman/rel_submodule_test/pulls/1/files

This view is still broken. On my test instance with the patch, I see

Hmm, the relative path is working, but the problem is that the pull's page doesn't share the same path layout, so "../../" is relative to "https://demo.gitea.com/gnuman/rel_submodule_test/pulls/1".

Not easy to fix ....

@wxiaoguang
Copy link
ContributorAuthor

I have some ideas to fix now, but the changes will be many, and won't be able to backport.

So I think we can have this fix first, and then refactor the "submodule relative path" problem later.

AdamMajer reacted with thumbs up emoji

@AdamMajer
Copy link
Contributor

Agreed. The relative-path submodule diff is not really a regression from 1.23.x since it wasn't available back then.

@GiteaBotGiteaBot added lgtm/need 1This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2This PR needs two approvals by maintainers to be considered for merging. labelsJul 10, 2025
@wxiaoguangwxiaoguangenabled auto-merge (squash)July 10, 2025 16:12
@GiteaBotGiteaBot added lgtm/doneThis PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1This PR needs approval from one additional maintainer to be merged. labelsJul 10, 2025
@wxiaoguangwxiaoguang merged commitf35dcfd intogo-gitea:mainJul 10, 2025
26 checks passed
@wxiaoguangwxiaoguang deleted the fix-submodule-relpath branchJuly 10, 2025 16:46
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull requestJul 10, 2025
@GiteaBotGiteaBot added the backport/doneAll backports for this PR have been created labelJul 10, 2025
wxiaoguang added a commit that referenced this pull requestJul 10, 2025
Backport#35034 by wxiaoguangFix#35033Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
zjjhot added a commit to zjjhot/gitea that referenced this pull requestJul 11, 2025
* giteaofficial/main:  Fix updating user visibility (go-gitea#35036)  Fix git commit committer parsing and add some tests (go-gitea#35007)  Refactor OpenIDConnect to support SSH/FullName sync (go-gitea#34978)  Support base64-encoded agit push options (go-gitea#35037)  Also display "recently pushed branch" alert on PR view (go-gitea#35001)  Make submodule link work with relative path (go-gitea#35034)  Update to go 1.24.5 (go-gitea#35031)  Improve CLI commands (go-gitea#34973)  Tweak eslint config, fix new issues (go-gitea#35019)# Conflicts:#templates/repo/commits_list.tmpl
@go-giteago-gitea locked asresolvedand limited conversation to collaboratorsOct 9, 2025
Sign up for freeto subscribe to this conversation on GitHub. Already have an account?Sign in.

Reviewers

@silverwindsilverwindsilverwind left review comments

@lunnylunnylunny approved these changes

+1 more reviewer

@hiifonghiifonghiifong approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

backport/doneAll backports for this PR have been createdbackport/v1.24This PR should be backported to Gitea 1.24lgtm/doneThis PR has enough approvals to get merged. There are no important open reservations anymore.modifies/frontendmodifies/goPull requests that update Go codeskip-changelogThis PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features.type/bug

Projects

None yet

Milestone

1.25.0

Development

Successfully merging this pull request may close these issues.

regression: relative URL paths in .gitmodules no longer produce correct submodule links

6 participants

@wxiaoguang@AdamMajer@lunny@silverwind@hiifong@GiteaBot
[8]ページ先頭
©2009-2025 Movatter.jp