From: Johannes Sixt Date: Mon, 1 Apr 2013 21:36:36 +0000 (+0200) Subject: rerere forget: grok files containing NUL X-Git-Tag: v1.8.2.2~27^2~1 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/53d8afafbbf455d24b0a94e4114709a4d495d460?hp=53d8afafbbf455d24b0a94e4114709a4d495d460 rerere forget: grok files containing NUL 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 Signed-off-by: Junio C Hamano ---