search

go-gitea / gitea

Git with a cup of tea! Painless self-hosted all-in-one software development service, including Git hosting, code review, team collaboration, package registry and CI/CD
https://gitea.com
MIT License
45.24k stars 5.5k forks source link

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

Open LondonRain opened 2 days ago

LondonRain commented 2 days ago

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 commented 2 days ago

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