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

Fix git commit committer parsing and add some tests#35007

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 14 commits intogo-gitea:mainfromlunny:lunny/fix_bug_commits_list2
Jul 10, 2025

Conversation

@lunny
Copy link
Member

@lunnylunny commentedJul 9, 2025•
edited by wxiaoguang
Loading

@GiteaBotGiteaBot added the lgtm/need 2This PR needs two approvals by maintainers to be considered for merging. labelJul 9, 2025
@github-actionsgithub-actionsbot added modifies/goPull requests that update Go code modifies/templatesThis PR modifies the template files labelsJul 9, 2025
@lunnylunny requested a review fromwxiaoguangJuly 9, 2025 01:50
@wxiaoguang

This comment was marked as resolved.

@lunny

This comment was marked as resolved.

@lunnylunny added type/bug backport/v1.24This PR should be backported to Gitea 1.24 labelsJul 9, 2025
@wxiaoguang

This comment was marked as resolved.

@lunny

This comment was marked as resolved.

@wxiaoguang

This comment was marked as resolved.

@lunny

This comment was marked as resolved.

@wxiaoguangwxiaoguang changed the titleRevert change in commit list table about User ID and adding some testsFix git commit committer parsing and adding some testsJul 9, 2025
@wxiaoguangwxiaoguang removed the backport/v1.24This PR should be backported to Gitea 1.24 labelJul 9, 2025
@wxiaoguangwxiaoguangforce-pushed thelunny/fix_bug_commits_list2 branch from9a39900 to53146a8CompareJuly 9, 2025 05:28
Copy link
Contributor

@wxiaoguangwxiaoguang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Done from my side

@wxiaoguangwxiaoguang changed the titleFix git commit committer parsing and adding some testsFix git commit committer parsing and add some testsJul 9, 2025
@silverwind
Copy link
Member

silverwind commentedJul 9, 2025•
edited
Loading

I tested this branch, it seems to fully both issues from#34991. We should definitely backport this to 1.24.

@silverwindsilverwind added the backport/v1.24This PR should be backported to Gitea 1.24 labelJul 9, 2025
Copy link
Member

@silverwindsilverwind left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

LGMT from functional perspective.

@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 9, 2025
@wxiaoguangwxiaoguang removed the backport/v1.24This PR should be backported to Gitea 1.24 labelJul 9, 2025
@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
@lunnylunny added the reviewed/wait-mergeThis pull request is part of the merge queue. It will be merged soon. labelJul 10, 2025
@silverwind
Copy link
Member

silverwind commentedJul 10, 2025•
edited
Loading

The more serious issue is the missing email-to-user association (for which I have no steps to reproduce, but it happens everywhere in my instance)

Have you check your "noreply address"? That fix is simple, justmodels/user/user.go:53146a8#diff-dacacda4403790aa4e9b4473c62b3af81b9c0a05d795dd31bd936866e26cfb13

Hmm no that can't be it. My NoReplyAddress resolves to likenoreply.git.foo.com but my email address from the commit is on a different TLD entirely, likeuser@bar.com. My user currently has multiple email addresses configured, maybe that is part of the problem.

Actually I found the issue. In configuration I hadservice.NO_REPLY_ADDRESS=bar.com which is incorrect and should have beennoreply.bar.com. Changing it to that value fixed the committer association.

@wxiaoguang
Copy link
Contributor

The more serious issue is the missing email-to-user association (for which I have no steps to reproduce, but it happens everywhere in my instance)

Have you check your "noreply address"? That fix is simple, justmodels/user/user.go:53146a8#diff-dacacda4403790aa4e9b4473c62b3af81b9c0a05d795dd31bd936866e26cfb13

Hmm no that can't be it. My NoReplyAddress resolves to likenoreply.git.foo.com but my email address from the commit is on a different TLD entirely, likeuser@bar.com. My user currently has multiple email addresses configured, maybe that is part of the problem.

Actually I found the issue. In configuration I hadservice.NO_REPLY_ADDRESS=bar.com which is incorrect and should have beennoreply.bar.com. Changing it to that value fixed the committer association.

Yep, this is my fourth time to fix the regressions from#33528, so I am pretty sure it is the cause.

I think I also know why your "noreply address" is incorrect, I guess in old days, Gitea used the DOMAIN as noreply address, then it caused problem, then the behavior was changed (a prefix as added). BUT, in old Gitea, Gitea also had another wrong behavior: it wrote garbage config options into the config file (I also fixed that), so very old users might be affected by incorrect config options.

@silverwind
Copy link
Member

Yeah it's possible that the incorrect value came from that incorrect config rewrite. In any case, I'm glad we figured it out.

@silverwind
Copy link
Member

@wxiaoguang is this good to merge from your side?

@wxiaoguang
Copy link
Contributor

The code written by me surely looks good to me. So I asked other maintainers to review.

@wxiaoguangwxiaoguangenabled auto-merge (squash)July 10, 2025 16:45
@wxiaoguangwxiaoguangenabled auto-merge (squash)July 10, 2025 18:21
@wxiaoguangwxiaoguang merged commit7a15334 intogo-gitea:mainJul 10, 2025
26 checks passed
@GiteaBotGiteaBot removed the reviewed/wait-mergeThis pull request is part of the merge queue. It will be merged soon. labelJul 10, 2025
@lunnylunny deleted the lunny/fix_bug_commits_list2 branchJuly 10, 2025 19:04
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

@wxiaoguangwxiaoguangwxiaoguang left review comments

@silverwindsilverwindsilverwind approved these changes

@lafrikslafriksAwaiting requested review from lafriks

@delvhdelvhAwaiting requested review from delvh

+1 more reviewer

@hiifonghiifonghiifong approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

lgtm/doneThis PR has enough approvals to get merged. There are no important open reservations anymore.modifies/goPull requests that update Go codemodifies/internalmodifies/templatesThis PR modifies the template filestype/bug

Projects

None yet

Milestone

1.25.0

Development

Successfully merging this pull request may close these issues.

Commit list author rendering regression in v1.24+ Avatars not visible in commit view when no-reply address is configured to the real domain

6 participants

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