pre-commit: clang-format of conflicting files fails
Bug #1883367 reported by
Daniel Schürmann
This bug affects 1 person
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| Mixxx |
New
|
Undecided
|
Unassigned | ||
Bug Description
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
https:/
I guess this is because git diff can't output the conflicted lines.
Revision history for this message
| Daniel Schürmann (daschuer) wrote | #1 |
Revision history for this message
| Swiftb0y (swiftb0y) wrote | #2 |
| lock status: | Metadata changes locked and limited to project staff |
To post a comment you must log in.
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.