git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1599999)
rerere forget: grok files containing NUL
authorJohannes Sixt <redacted>
Mon, 1 Apr 2013 21:36:36 +0000 (23:36 +0200)
committerJunio C Hamano <redacted>
Tue, 2 Apr 2013 20:00:41 +0000 (13:00 -0700)
commit53d8afafbbf455d24b0a94e4114709a4d495d460
tree72e962bc7cc59eef2bd01fc4f422dca3b8462eabtree | snapshot
parent15999998fbda60552742275570947431b57108aecommit | diff
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 <redacted>
Signed-off-by: Junio C Hamano <redacted>
rerere.c diff | blob | history
t/t2030-unresolve-info.sh diff | blob | history
git clone https://git.99rst.org/PROJECT