Skip to content

fix(repo): merge the em-dash and shared-copies line lists with git's union driver #11113

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

Merged
kyle-sexton merged 6 commits into from
Oct 30, 2026
Merged

fix(repo): merge the em-dash and shared-copies line lists with git's union driver #11113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c788a77
fix(repo): merge the em-dash and shared-copies line lists with git's …
kyle-sexton Oct 30, 2026
a5cbe42
Merge remote-tracking branch 'origin/main' into fix/em-dash-allowlist…
kyle-sexton Oct 30, 2026
c2d7e2c
fix(repo): move the union-merge attributes to scripts/.gitattributes
kyle-sexton Oct 30, 2026
ee1f8db
test(repo): record scripts/.gitattributes as covered by no shell suite
kyle-sexton Oct 30, 2026
d9ca3f5
Merge remote-tracking branch 'origin/main' into fix/em-dash-allowlist…
kyle-sexton Oct 30, 2026
670db97
Merge remote-tracking branch 'origin/main' into fix/em-dash-allowlist…
kyle-sexton Oct 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions scripts/.gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Line-list registries: git's built-in union driver keeps both sides' lines
# instead of conflicting. Only lists whose order carries no meaning and whose
# gate fails what a bad union can leave behind, such as a line one side removed.
# This file, not the root .gitattributes, holds them: the root one syncs from
# melodic-software/standards.

# Gate: check-purged-em-dashes.sh fails a stale entry.
em-dash-purged-paths.txt merge=union
# Gate: sync-shared-copies.sh --check fails a duplicate, a missing canonical,
# or a registered copy that is missing.
shared-copies.txt merge=union
1 change: 1 addition & 0 deletions scripts/affected-tests-no-suite.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
# here. The toolchain ecosystem YAMLs still have none.
.github/*
.gitattributes
scripts/.gitattributes
.gitignore
.gitleaksignore
.lycheeignore
Expand Down
Loading