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.

Sign up for GitHub

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

Jump to bottom

pre-commit: clang-format of conflicting files fails #10017

Open

mixxxbot opened this issue Aug 23, 2022 · 1 comment

Collaborator

mixxxbot commented Aug 23, 2022

Reported by: daschuer
Date: 2020-06-13T13:58:11Z
Status: New
Importance: Undecided
Launchpad Issue: lp1883367

In case of a merge commit the pre-commit hook is intended to runs for conflicted files only.

Unfortunately that fails and unrelated files are touched.
This has caused serious issues issues in
#2512

I guess this is because git diff can't output the conflicted lines.

Collaborator Author

mixxxbot commented Aug 23, 2022

Commented by: daschuer
Date: 2020-06-13T14:05:12Z

Interestingly the script is called is also called for for conflicting files where the automatic conflict resolution works. This produces extra noise.

So I think we need to stop reformatting merge commits.

mixxxbot transferred this issue from another repository

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment