Andrew's git / gitweb.git / diff
?
Merge branch 'en/rerere-multi-stage-1-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 21 Nov 2018 13:57:44 +0000 (22:57 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 Nov 2018 13:57:44 +0000 (22:57 +0900)
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

1  2 
rerere.c patch | diff1 | diff2 | blob | history
t/t4200-rerere.sh patch | diff1 | diff2 | blob | history
diff --cc rerere.c
Simple merge
diff --cc t/t4200-rerere.sh
Simple merge