github-starred/gitea
2
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-03-14 11:56:41 -05:00
Code Issues 2.6k Packages Projects Releases 100 Wiki Activity

Squash in PR with co-authored #13455

New Issue
Closed
opened 2025-11-02 10:42:53 -06:00 by GiteaMirror · 6 comments
GiteaMirror commented 2025-11-02 10:42:53 -06:00
Owner
Copy Link

Originally created by @trofim24 on GitHub (Sep 4, 2024).

Description

  • Create Pull Request with 1 commit from another author
  • Click Create Squash commit by another gitea account
  • Delete all template message and leave only new line
  • Click Create Squash commit

commit message contains deleted lines

See video -
https://github.com/user-attachments/assets/60cc083b-c629-4c6a-b818-5fc99fca6dc4

Example of PR - https://demo.gitea.com/trofim24/test-bug/pulls/1

Gitea Version

1.22.1

Can you reproduce the bug on the Gitea demo site?

Yes

Log Gist

No response

Screenshots

No response

Git Version

1.23.0+dev-460-ga366af4b7a

Operating System

macos

How are you running Gitea?

using https://demo.gitea.com/

Database

None

Originally created by @trofim24 on GitHub (Sep 4, 2024). ### Description - Create Pull Request with 1 commit from another author - Click Create Squash commit by another gitea account - Delete all template message and leave only new line - Click Create Squash commit commit message contains deleted lines See video - https://github.com/user-attachments/assets/60cc083b-c629-4c6a-b818-5fc99fca6dc4 Example of PR - https://demo.gitea.com/trofim24/test-bug/pulls/1 ### Gitea Version 1.22.1 ### Can you reproduce the bug on the Gitea demo site? Yes ### Log Gist _No response_ ### Screenshots _No response_ ### Git Version 1.23.0+dev-460-ga366af4b7a ### Operating System macos ### How are you running Gitea? using https://demo.gitea.com/ ### Database None
GiteaMirror added the type/bug label 2025-11-02 10:42:53 -06:00
GiteaMirror commented 2025-11-02 10:42:54 -06:00
Author
Owner
Copy Link

@hiifong commented on GitHub (Dec 5, 2024):

I tried many times, but I only reproduced it once. I think it might be caused by cache. Can you reproduce the issue again?

@hiifong commented on GitHub (Dec 5, 2024): I tried many times, but I only reproduced it once. I think it might be caused by cache. Can you reproduce the issue again?
GiteaMirror commented 2025-11-02 10:42:54 -06:00
Author
Owner
Copy Link

@trofim24 commented on GitHub (Dec 16, 2024):

@hiifong
I reproduced this problem now on latest gitea version in incognito mode. It's not cache
Commit and PR must be from one user
Squash must do another user with delete all template message and leave only new line
View new video

Version: 1.23.0+dev-789-g18061af490

https://github.com/user-attachments/assets/f48a44be-6ce3-4f53-bbdc-52c7f4938033

@trofim24 commented on GitHub (Dec 16, 2024): @hiifong I reproduced this problem now on latest gitea version in incognito mode. It's not cache Commit and PR must be from one user Squash must do another user with delete all template message and leave only new line View new video Version: 1.23.0+dev-789-g18061af490 https://github.com/user-attachments/assets/f48a44be-6ce3-4f53-bbdc-52c7f4938033
GiteaMirror commented 2025-11-02 10:42:54 -06:00
Author
Owner
Copy Link

@hiifong commented on GitHub (Dec 16, 2024):

@hiifong I reproduced this problem now on latest gitea version in incognito mode. It's not cache Commit and PR must be from one user Squash must do another user with delete all template message and leave only new line View new video

Version: 1.23.0+dev-789-g18061af490

Screen.Recording.2024-12-16.at.10.48.50.AM.mov

Thank you for your report

@hiifong commented on GitHub (Dec 16, 2024): > @hiifong I reproduced this problem now on latest gitea version in incognito mode. It's not cache Commit and PR must be from one user Squash must do another user with delete all template message and leave only new line View new video > > Version: 1.23.0+dev-789-g18061af490 > > Screen.Recording.2024-12-16.at.10.48.50.AM.mov Thank you for your report
GiteaMirror commented 2025-11-02 10:42:54 -06:00
Author
Owner
Copy Link

@hiifong commented on GitHub (Dec 28, 2024):

ADD_CO_COMMITTER_TRAILERS: true: Add co-authored-by and co-committed-by trailers to merge commit messages if committer does not match author.

Based on my review of the documentation, it appears that ADD_CO_COMMITTER_TRAILERS is enabled by default, which doesn't seem to be a bug. If you prefer not to have co-author and co-committer information in the commit message, you may consider disabling the ADD_CO_COMMITTER_TRAILERS option. If you have any further questions, please feel free to continue the discussion.

@hiifong commented on GitHub (Dec 28, 2024): > [ADD_CO_COMMITTER_TRAILERS: true: Add co-authored-by and co-committed-by trailers to merge commit messages if committer does not match author.](https://docs.gitea.com/administration/config-cheat-sheet?_highlight=pull#repository---pull-request-repositorypull-request) Based on my review of the documentation, it appears that `ADD_CO_COMMITTER_TRAILERS` is enabled by default, which doesn't seem to be a bug. If you prefer not to have co-author and co-committer information in the commit message, you may consider disabling the ADD_CO_COMMITTER_TRAILERS option. If you have any further questions, please feel free to continue the discussion.
GiteaMirror commented 2025-11-02 10:42:55 -06:00
Author
Owner
Copy Link

@trofim24 commented on GitHub (Dec 28, 2024):

@hiifong I think, this different behavior depending on who creates Pull Request seems like a bug.

  • Commit creates User1. PR and Squash with delete all template message and leave only new line creates User2. Commit message doesn't contain deleted lines.
  • Commit and PR creates User1. Squash with delete all template message and leave only new line creates User2. Commit message contains deleted lines.
@trofim24 commented on GitHub (Dec 28, 2024): @hiifong I think, this different behavior depending on who creates Pull Request seems like a bug. - Commit creates User1. PR and Squash with delete all template message and leave only new line creates User2. Commit message doesn't contain deleted lines. - Commit and PR creates User1. Squash with delete all template message and leave only new line creates User2. Commit message contains deleted lines.
GiteaMirror commented 2025-11-02 10:42:55 -06:00
Author
Owner
Copy Link

@hiifong commented on GitHub (Dec 28, 2024):

@hiifong I think, this different behavior depending on who creates Pull Request seems like a bug.

  • Commit creates User1. PR and Squash with delete all template message and leave only new line creates User2. Commit message doesn't contain deleted lines.
  • Commit and PR creates User1. Squash with delete all template message and leave only new line creates User2. Commit message contains deleted lines.

Maybe #33020 can fix this bug

@hiifong commented on GitHub (Dec 28, 2024): > @hiifong I think, this different behavior depending on who creates Pull Request seems like a bug. > > * Commit creates User1. PR and Squash with delete all template message and leave only new line creates User2. Commit message doesn't contain deleted lines. > * Commit and PR creates User1. Squash with delete all template message and leave only new line creates User2. Commit message contains deleted lines. Maybe #33020 can fix this bug
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
$20
$250
$50
$500
backport/done
💎 Bounty
docs-update-needed
good first issue
hacktoberfest
issue/bounty
issue/confirmed
issue/critical
issue/duplicate
issue/needs-feedback
issue/not-a-bug
issue/regression
issue/stale
issue/workaround
lgtm/need 2
modifies/api
modifies/translation
outdated/backport/v1.18
outdated/theme/markdown
outdated/theme/timetracker
performance/bigrepo
performance/cpu
performance/memory
performance/speed
pr/breaking
proposal/accepted
proposal/rejected
pr/wip
pull-request
Mirrored from GitHub Pull Request
 reviewed/wontfix
💰 Rewarded
skip-changelog
status/blocked
topic/accessibility
topic/api
topic/authentication
topic/build
topic/code-linting
topic/commit-signing
topic/content-rendering
topic/deployment
topic/distribution
topic/federation
topic/gitea-actions
topic/issues
topic/lfs
topic/mobile
topic/moderation
topic/packages
topic/pr
topic/projects
topic/repo
topic/repo-migration
topic/security
topic/theme
topic/ui
topic/ui-interaction
topic/ux
topic/webhooks
topic/wiki
type/bug
type/deprecation
type/docs
type/enhancement
type/feature
type/miscellaneous
type/proposal
type/question
type/refactoring
type/summary
type/testing
type/upstream
No Label type/bug
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/gitea#13455
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?