Re: [PATCH] rerere forget: grok files containing NUL

2013-04-02 Thread Johannes Sixt
Am 02.04.2013 21:18, schrieb Junio C Hamano: > Johannes Sixt writes: > >>> Does the three-way merge machinery replay recorded resolution for >>> such a binary file correctly (after your fix, that is)? >> >> Yes, it does. It recognizes the binary-ness and picks 'our' side. Only >> then comes rerer

Re: [PATCH] rerere forget: grok files containing NUL

2013-04-02 Thread Junio C Hamano
Johannes Sixt writes: >> Does the three-way merge machinery replay recorded resolution for >> such a binary file correctly (after your fix, that is)? > > Yes, it does. It recognizes the binary-ness and picks 'our' side. Only > then comes rerere_mem_getline into play. Surely getline() needs to be

Re: [PATCH] rerere forget: grok files containing NUL

2013-04-02 Thread Johannes Sixt
Am 02.04.2013 00:48, schrieb Junio C Hamano: > Johannes Sixt writes: > >> Using 'git rerere forget .' after a merge that involved binary files >> runs into an infinite loop if the binary file contains a zero byte. >> Replace a strchrnul by memchr because the former does not make progress >> as so

Re: [PATCH] rerere forget: grok files containing NUL

2013-04-01 Thread Junio C Hamano
Johannes Sixt writes: > Using 'git rerere forget .' after a merge that involved binary files > runs into an infinite loop if the binary file contains a zero byte. > Replace a strchrnul by memchr because the former does not make progress > as soon as the NUL is encountered. Hmph, thanks. Is it t

[PATCH] rerere forget: grok files containing NUL

2013-04-01 Thread Johannes Sixt
Using 'git rerere forget .' after a merge that involved binary files runs into an infinite loop if the binary file contains a zero byte. Replace a strchrnul by memchr because the former does not make progress as soon as the NUL is encountered. Signed-off-by: Johannes Sixt --- The new test case r