git.99rst.org Git - git.git/commit

author	Junio C Hamano <redacted>
	Wed, 21 Nov 2018 13:57:44 +0000 (22:57 +0900)
committer	Junio C Hamano <redacted>
	Wed, 21 Nov 2018 13:57:44 +0000 (22:57 +0900)
commit	b4eafbcdb84fc406bff37f06fdf6310aca7d0249
tree	89f6f96f46f64695ac84ad9a49e14017e573ef77	tree \| snapshot
parent	e1372c37de9bbca8a96db10fe8ab7b3a420c9108	commit \| diff
parent	ad2bf0d9b43433583e88128c278ce31c7ca4e431	commit \| diff

Merge branch 'en/rerere-multi-stage-1-fix' into maint

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 \|	blob \| history
t/t4200-rerere.sh	diff1 \|	diff2 \|	blob \| history

RSS Atom

git clone https://git.99rst.org/PROJECT

rerere.c	diff1 \|	diff2 \|	blob \| history
t/t4200-rerere.sh	diff1 \|	diff2 \|	blob \| history