Change clean command to only operate on non-encrypted files as recommended by git docs#179
Closed
jirutka wants to merge 1 commit intoAGWA:masterfrom
Closed
Change clean command to only operate on non-encrypted files as recommended by git docs#179jirutka wants to merge 1 commit intoAGWA:masterfrom
jirutka wants to merge 1 commit intoAGWA:masterfrom
Conversation
As recommended by gitattributes(5):
> For best results, clean should not alter its output further if it is
> run twice ("clean->clean" should be equivalent to "clean"), and
> multiple smudge commands should not alter clean's output
> ("smudge->smudge->clean" should be equivalent to "clean").
I've extracted this change from AGWA#107.
Co-Authored-By: Shlomo Shachar <shlomo.shachar@binatix.com>
Owner
|
Does this solve an actual problem? I understand that this is recommended by gitattributes(5), but that man page is thinking of filters that do things like strip carriage returns, which could hypothetically have already been done before committing. Under what circumstances could a file already be encrypted when being committed (that doesn't indicate a deeper problem that needs to be fixed)? I am very hesitant about adding a code path that could cause encryption to be bypassed, so I am seeking to really understand the motivation behind this. Thanks. |
Author
|
To be honest, I don’t know. I’m just refactoring #107 and this change is not related to the merge command, so I’ve extracted it into a separate PR. |
This file contains hidden or 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
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.
As recommended by gitattributes(5):
I've extracted this change from #107.
Co-Authored-By: @shlomosh