Re: [PATCH v6] safecrlf: Add mechanism to warn about irreversible crlf conversions

Steffen Prohaska [off-list ref] writes:

quoted

The whole point of git-apply is to apply the patch.  If you say
--whitespace=fix and some contents (say one of the testsuite
files in our t/ directory) needed to keep trailing newline, you
obviously are left with a broken result, and you would recover
by checking it out from index or HEAD and reapply.  Why
shouldn't the same principle hold here?

You are right.  All files should be committed before running
git apply and therefore the original files can be recovered by
git checkout.  Hmm ... so apply should either just warn or be
completely quiet as git blame is?  I think it should warn.

I agree that warning is needed if the setting says "warn".

Of course, it could become part of an irreversible action if you
did this:

	$ git commit ;# or whatever.  Now there is no local mods
        $ git apply <patch-1
	$ edit ;# to fix things up
        $ git apply <patch-2

and if you get the warning from patch-2.

But the safecrlf warning is primarily about a misdetection of
binaryness, so I do not think this sequence is not something we
would even want to worry about.