Skip to content

mergiraf: use mergiraf cli to generate gitattributes #7126

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

Closed
wants to merge 1 commit into from

Conversation

drawbu
Copy link

@drawbu drawbu commented May 25, 2025

Use mergiraf official supported languages list to generate git attributes instead of using a wildcard, as advised in the official documentation.
We generate the git attributes, so we can't rely on testing, or they will break every so often

I'd like your opinion @bobvanderlinden

Description

Checklist

  • Change is backwards compatible.

  • Code formatted with nix fmt or
    nix-shell -p treefmt nixfmt-rfc-style keep-sorted --run treefmt.

  • Code tested through nix-shell --pure tests -A run.all
    or nix build --reference-lock-file flake.lock ./tests#test-all using Flakes.

  • Test cases updated/added. See example.

  • Commit messages are formatted like

    {component}: {description}
    
    {long description}
    

    See CONTRIBUTING for more information and recent commit messages for examples.

  • If this PR adds a new module

    • Added myself as module maintainer. See example.

Maintainer CC

Use gitattributes official supported languages list to generate
gitattributes instead of using a wildcard, as advised in the
[official documentation](https://mergiraf.org/usage.html). I we generate
the git attributes, we can't relay on testing or they will break every
so often
@ambroisie
Copy link
Contributor

This would introduce IFD when enabling the option.

@bobvanderlinden
Copy link
Contributor

I had the same idea initially for the mergiraf module. See the discussion here: #6633 (review)

The main maintainer of mergiraf mentioned using * instead (#6633 (comment)), so I moved to * to avoid IFD.

Do you have an use case where * doesn't suffice?

@drawbu
Copy link
Author

drawbu commented Jun 3, 2025

Yeah, I don't know how I missed that from the original change you requested on the PR... I did not use a case where * did not suffice, but figured that since it was an explicit requirement in the doc, it was for a good reason. Since it is a change that already has been discussed in the prev PR, I should close it.

Thanks for the message, I guess I'll have to read more carefully next time!

@drawbu drawbu closed this Jun 3, 2025
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.

3 participants