Skip to content

avoid duplicate files in --all-files during conflict#3727

Merged
asottile merged 1 commit into
mainfrom
dedupe
Jul 21, 2026
Merged

avoid duplicate files in --all-files during conflict#3727
asottile merged 1 commit into
mainfrom
dedupe

Conversation

@asottile

@asottile asottile commented Jul 21, 2026

Copy link
Copy Markdown
Member

resolves #3706

@asottile
asottile enabled auto-merge July 21, 2026 20:35
@asottile
asottile merged commit 766e550 into main Jul 21, 2026
28 checks passed
@asottile
asottile deleted the dedupe branch July 21, 2026 20:44
@albertferras-vrf

albertferras-vrf commented Jul 22, 2026

Copy link
Copy Markdown

@asottile this change broke some of our CI pipelines running pre-commit because we were using git version 2.30.2 (--deduplicate was added on 2.31.0).
We will update our git binary, but wondering if pre-commit should also check for minimum git command version or if this --deduplicate tag should only be added after checking git version first. I couldn't find anywhere in the documentation which is the minimum git binary that should be instaleld

@asottile

Copy link
Copy Markdown
Member Author

2.31 is 5 years old

@pre-commit pre-commit locked as resolved and limited conversation to collaborators Jul 22, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Development

Successfully merging this pull request may close these issues.

Duplicate files when doing pre-commit run --all-files during git conflict

2 participants