Skip to content
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.

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

Revert change to .gitignore.d behavior in #196 #334

Merged
merged 1 commit into from
Dec 29, 2023

Conversation

jwhitley
Copy link
Contributor

Fixes #333.

In git 2.7.0, new git behavior changed gitignore to no longer require un-ignoring every parent directory above an un-ignored file. vcsh updated its logic around this in PR #196 (e4f4ecf). Unfortunately, git's change was reverted before 2.8.0-rc4 (git/git@5cee349).

This change therefore reverts the logic change in #196 causing vcsh write-gitignore to once again emit parent directories into generated .gitignore.d/<repo> files.

See #333 for the gory details.

Fixes RichiH#333.

In git 2.7.0, new git behavior changed gitignore to no longer require
un-ignoring every parent directory above an un-ignored file. vcsh
updated its logic around this in PR RichiH#196 (vcsh commit e4f4ecf).
Unfortunately, git's change was reverted before 2.8.0-rc4 (git commit
5cee349).

This change therefore reverts the logic change in RichiH#196 causing `vcsh
write-gitignore` to once again emit parent directories into generated
`.gitignore.d/<repo>` files.

See RichiH#333 for the gory details.
@jwhitley
Copy link
Contributor Author

FWIW, I opted to leave the code that gets git's version info, but that's now dead code so there's an argument to remove it as well.

@jwhitley
Copy link
Contributor Author

The editorconfig lint check appears to have failed because it's looking inside the .git directory?!. Looks like something's misconfigured.

jwhitley added a commit to jwhitley/vcsh-root that referenced this pull request Dec 28, 2023
@jwhitley jwhitley changed the title Revert change to ,gitignore.d behavior in #196 Revert change to .gitignore.d behavior in #196 Dec 28, 2023
@jwhitley
Copy link
Contributor Author

Confirmed. Looks like an update to the editorconfig checker Docker image is required, to >=2.7.1. Might as well bump to latest release of 2.7.2. See editorconfig-checker/editorconfig-checker#268

@alerque alerque merged commit 71b036f into RichiH:main Dec 29, 2023
4 of 5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

.gitignore.d is broken for files in subdirs due to git behavior revert
2 participants