diff options
| author |  Johannes Sixt <j6t@kdbg.org> | 2013-04-01 23:36:36 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-04-02 13:00:41 -0700 |
| commit | 53d8afafbbf455d24b0a94e4114709a4d495d460 (patch) | |
| tree | 72e962bc7cc59eef2bd01fc4f422dca3b8462eab /git-gui | |
| parent | Git 1.8.0.3 (diff) | |
| download | tgif-53d8afafbbf455d24b0a94e4114709a4d495d460.tar.xz | |
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>
Diffstat (limited to 'git-gui')
0 files changed, 0 insertions, 0 deletions