Skip to content
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 our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge a branch into master, then open a new pr with the same branch: still show diff. I expect no diff, as it's already merged. #19878

Closed
ormanlis opened this issue Jun 3, 2022 · 5 comments
Labels
issue/needs-feedback For bugs, we need more details. For features, the feature must be described in more detail type/bug

Comments

@ormanlis
Copy link

ormanlis commented Jun 3, 2022

Description

Merge a branch into master, then open a new pr with the same branch: still show diff. I expect no diff, as it's already merged.

Gitea Version

1.15.10 built with GNU Make 4.3, go1.16.13 : bindata, timetzdata, sqlite, sqlite_unlock_notify

Can you reproduce the bug on the Gitea demo site?

No

Log Gist

No response

Screenshots

No response

Git Version

2.30.2

Operating System

ubuntu

How are you running Gitea?

docker

Database

SQLite

@zeripath
Copy link
Contributor

zeripath commented Jun 3, 2022

Can you create an example on try.gitea.io?

@ormanlis
Copy link
Author

ormanlis commented Jun 3, 2022

You can just merge a commit and then open a pr. I think this must be very common and everyone already encountered. I will try to reproduce in there later, as now I'm not home.

@lunny
Copy link
Member

lunny commented Jun 3, 2022

I think maybe you are still using the old merge base?

@wxiaoguang wxiaoguang added the issue/needs-feedback For bugs, we need more details. For features, the feature must be described in more detail label Jun 6, 2022
@ormanlis
Copy link
Author

I think maybe you are still using the old merge base?

Could you tell me how to not use it? I think I have almost all defaults.

@GiteaBot
Copy link
Collaborator

GiteaBot commented Sep 8, 2023

We close issues that need feedback from the author if there were no new comments for a month. 🍵

@GiteaBot GiteaBot closed this as completed Sep 8, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Oct 24, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
issue/needs-feedback For bugs, we need more details. For features, the feature must be described in more detail type/bug
Projects
None yet
Development

No branches or pull requests

5 participants