| commit | 53d8afafbbf455d24b0a94e4114709a4d495d460 | |
| author | Johannes Sixt <j6t@kdbg.org> | |
| Mon, 1 Apr 2013 21:36:36 +0000 (1 23:36 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 2 Apr 2013 20:00:41 +0000 (2 13:00 -0700) | ||
| tree | 72e962bc7cc59eef2bd01fc4f422dca3b8462eab | treesnapshot (tar.gz zip) |
| parent | 15999998fbda60552742275570947431b57108ae | commitdiff |
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 <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| rerere.c | diffblobblamehistory | |
| t/t2030-unresolve-info.sh | diffblobblamehistory |