Description
When merging a feature branch into staging for testing, and then later merging the same feature branch into develop (which then gets merged into staging), Gitea shows the commits from the feature branch as "new" in the second staging merge — even though they were already on staging before. GitHub and GitLab handle this correctly by only showing commits that are actually new to the target branch.
Feature Branch:
includes commit 123
Merge Feature Branch into Staging:
PR shows commit 123 as new commit for staging branch
Merge Feature Branch into Develop:
PR shows commit 123 as new commit for develop branch
Merge Develop into Staging:
PR shows commit 123 as new commit for staging branch <-- this should not happen, since commit 123 is already in the staging branch
I brought this issue up on the official Discord server, where I was referred to #36485, but that didn't solve the problem.
I wanted to reproduce the bug on the Gitea demo site, but I get a lot of 503 errors there.
Gitea Version
1.26.0
Can you reproduce the bug on the Gitea demo site?
No
Log Gist
No response
Screenshots
No response
Git Version
No response
Operating System
No response
How are you running Gitea?
We are running Gitea on our Synology with the official Docker image.
Database
MySQL/MariaDB
Description
When merging a feature branch into staging for testing, and then later merging the same feature branch into develop (which then gets merged into staging), Gitea shows the commits from the feature branch as "new" in the second staging merge — even though they were already on staging before. GitHub and GitLab handle this correctly by only showing commits that are actually new to the target branch.
Feature Branch:
includes commit 123
Merge Feature Branch into Staging:
PR shows commit 123 as new commit for staging branch
Merge Feature Branch into Develop:
PR shows commit 123 as new commit for develop branch
Merge Develop into Staging:
PR shows commit 123 as new commit for staging branch <-- this should not happen, since commit 123 is already in the staging branch
I brought this issue up on the official Discord server, where I was referred to #36485, but that didn't solve the problem.
I wanted to reproduce the bug on the Gitea demo site, but I get a lot of 503 errors there.
Gitea Version
1.26.0
Can you reproduce the bug on the Gitea demo site?
No
Log Gist
No response
Screenshots
No response
Git Version
No response
Operating System
No response
How are you running Gitea?
We are running Gitea on our Synology with the official Docker image.
Database
MySQL/MariaDB