| commit | bd3941a0aed0756aba43f504d0dea7a3fbe0c82b | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 24 Sep 2018 17:30:48 +0000 (24 10:30 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 24 Sep 2018 17:30:48 +0000 (24 10:30 -0700) | ||
| tree | 17d9c22f6491f77904aa727ccfc833c9150d441b | treesnapshot (tar.gz zip) |
| parent | e3d4ff037db41234eaf74167ab7d1a443c23243d | commitdiff |
| parent | ad2bf0d9b43433583e88128c278ce31c7ca4e431 | commitdiff |
Merge branch 'en/rerere-multi-stage-1-fix'
A corner case bugfix in "git rerere" code.
* en/rerere-multi-stage-1-fix:
rerere: avoid buffer overrun
t4200: demonstrate rerere segfault on specially crafted merge
A corner case bugfix in "git rerere" code.
* en/rerere-multi-stage-1-fix:
rerere: avoid buffer overrun
t4200: demonstrate rerere segfault on specially crafted merge
| rerere.c | diff1 | diff2 | blobhistory |
| t/t4200-rerere.sh | diff1 | diff2 | blobhistory |