Re: [PATCH 0/2] Add --no-filters option to git-add

From: Andrej Shadura <andrew.shadura@collabora.co.uk>
Date: Feb 20, 2021, 09:30 UTC
Message-ID: <c660bf7b-cd59-43d4-a374-11997f0b15d1@collabora.co.uk>
In-Reply-To: <a58d8057-9847-ba57-1bf5-5d27c235d210@collabora.co.uk>

On 20/02/2021 09:06, Andrej Shadura wrote:

Show 5 quoted lines

> On 19/02/2021 23:36, brian m. carlson wrote:
>> So I think that while this might be a useful escape hatch for users, I
>> definitely want to see a compelling rationale for it and a big warning
>> in the documentation and an update to the relevant entry in the Git FAQ
>> before we accept such a patch.

Here’s my proposal for the updated manpage description of the option:

--no-filters::

Add the contents as is, ignoring any input filter that would have been chosen by the attributes mechanism, including the end-of-line conversion. Note that this option is not intended for interactive use, since files added this way will always show up as modified if Git were to apply transformations to them, making the situation potentially very confusing.

And here the FAQ entry extended:

It is also possible for perpetually modified files to occur on any platform if a smudge or clean filter is in use on your system but a file was previously committed without running the smudge or clean filter. To fix this, run the following on an otherwise clean working tree: + ---- $ git add --renormalize . ---- + Another situation where perpetually modified may appear on any platform is when a file has been committed without running any filters (including the end-of-line conversion), but the `.gitattributes` file states that this file requires a conversion. In this case, you can either renormalize the files if this happened by mistake, or modify `.gitattributes` or `$GIT_DIR/info/attributes` as described above to exempt the file from the conversion if this was intentional.

(I will send an updated patch set when we agree on the wording.)

-- 
Cheers,
  Andrej