Re: [PATCH/FIXUP 6/2] apply: clarify read_old_data() is about no-index case

2017-08-17 Thread Junio C Hamano
Junio C Hamano writes: > Torsten Bögershausen writes: > >> Unless we re-define the meaning of "NULL" into "don't do CRLF conversions, >> like SAFE_CRLF_KEEP_CRLF does. > > My preference is not to use NULL as any hint. Instead, the "flag" > parameter we already

Re: [PATCH/FIXUP 6/2] apply: clarify read_old_data() is about no-index case

2017-08-17 Thread Torsten Bögershausen
On Thu, Aug 17, 2017 at 12:12:36AM -0700, Junio C Hamano wrote: > Torsten Bögershausen writes: > > > Unless we re-define the meaning of "NULL" into "don't do CRLF conversions, > > like SAFE_CRLF_KEEP_CRLF does. > > My preference is not to use NULL as any hint. Instead, the

Re: [PATCH/FIXUP 6/2] apply: clarify read_old_data() is about no-index case

2017-08-17 Thread Junio C Hamano
Torsten Bögershausen writes: > Unless we re-define the meaning of "NULL" into "don't do CRLF conversions, > like SAFE_CRLF_KEEP_CRLF does. My preference is not to use NULL as any hint. Instead, the "flag" parameter we already pass to convert_to_git(), just like the updated

Re: [PATCH/FIXUP 6/2] apply: clarify read_old_data() is about no-index case

2017-08-17 Thread Junio C Hamano
Torsten Bögershausen writes: > I don't have time to look at this today or tomorrow, > please give a hint if you are working further. It is past my bedtime, and generally I prefer not to touch topics that I know other people are willing to look into, especially when I know those

Re: [PATCH/FIXUP 6/2] apply: clarify read_old_data() is about no-index case

2017-08-17 Thread Torsten Bögershausen
On Wed, Aug 16, 2017 at 11:34:45AM -0700, Junio C Hamano wrote: > With the previous fixes to CRLF handling in place, read_old_data() > knows what it wants convert_to_git() to do with respect to CRLF. In > fact, this codepath is about applying a patch to a file in the > filesystem, which may not

[PATCH/FIXUP 6/2] apply: clarify read_old_data() is about no-index case

2017-08-16 Thread Junio C Hamano
With the previous fixes to CRLF handling in place, read_old_data() knows what it wants convert_to_git() to do with respect to CRLF. In fact, this codepath is about applying a patch to a file in the filesystem, which may not exist in the index, or may exist but may not match what is recorded in