Fix git lfs glob pattern #23
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
I had quite some trouble getting git lfs running locally, which came down to two problems: - LFS was using SSH auth instead of HTTPS auth for some reason. I fixed that by registering my SSH key, and properly setting up SSO for it. Nothing major, just an annoyance. Nevertheless, I removed the explicit `.lfsconfig`, as git should inherit those urls from the primary remote. - For some reason, I ended up in this weird state where LFS would properly resolve files, but then git itself was confused and considered those files to be modified and staged for commit. This prevented me from pulling and switching branches because "you have uncommited changes". Doing the commit as git suggested would indeed actually commit the files, and not go through the git filter. No idea whats happening here, but looks like git and lfs disagree on how to interpret the glob patterns in the `.gitattributes`, so I made those more explicit, and now both agree and git will not flag those files as "ready for commit" anymore.
|
The author of this PR, Swatinem, is not an activated member of this organization on Codecov. |
matt-codecov
requested changes
Aug 6, 2024
matt-codecov
approved these changes
Aug 8, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I had quite some trouble getting git lfs running locally, which came down to two problems:
LFS was using SSH auth instead of HTTPS auth for some reason. I fixed that by registering my SSH key, and properly setting up SSO for it. Nothing major, just an annoyance. Nevertheless, I removed the explicit.lfsconfig, as git should inherit those urls from the primary remote.For some reason, I ended up in this weird state where LFS would properly resolve files, but then git itself was confused and considered those files to be modified and staged for commit. This prevented me from pulling and switching branches because "you have uncommited changes". Doing the commit as git suggested would indeed actually commit the files, and not go through the git filter. No idea whats happening here, but looks like git and lfs disagree on how to interpret the glob patterns in the
.gitattributes, so I made those more explicit, and now both agree and git will not flag those files as "ready for commit" anymore.Please try these changes locally to see if they work correctly with
sapling.