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

"Changes since your last review filter" needs to ignore merge commits #32563

Open
LondonRain opened this issue Nov 19, 2024 · 1 comment
Open
Labels
topic/pr Issues related to pull requests type/bug

Comments

@LondonRain
Copy link

Description

The "changes since your last review filter" also shows merge commits, where I updated my feature PR branch from the base branch. Those changes would not be shown when looking at all commits of the PR as they are not different to the base branch. The commit filter needs to ignore merge commits.

Gitea Version

1.22.3

Can you reproduce the bug on the Gitea demo site?

No

Log Gist

No response

Screenshots

No response

Git Version

No response

Operating System

Debian

How are you running Gitea?

Binary

Database

MySQL/MariaDB

@delvh
Copy link
Member

delvh commented Nov 19, 2024

Do you happen to know the correct argument to git for it?
At the moment, we use git diff-tree --name-only --root --no-commit-id -r -z $BASE $HEAD to get the changed files between the two commits.
It will either be as simple as adding the correct argument to it, or it will be (basically) impossible.

Is that even the part you mean?
From your description, I'm not quite sure exactly what you're asking for:
Are you asking for

  • not showing file changes in merge commits that changed in no other commit inbetween?
  • not showing the Only show changes since the last review comparison button when the base commit is a merge commit?
  • something else?

@kemzeb kemzeb added the topic/pr Issues related to pull requests label Nov 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
topic/pr Issues related to pull requests type/bug
Projects
None yet
Development

No branches or pull requests

3 participants