Skip to main content

Browse the archive

Revision b4eafbcdb84fc406bff37f06fdf6310aca7d0249 authored by Junio C Hamano on 21 November 2018, 13:57:44 UTC, committed by Junio C Hamano on 21 November 2018, 13:57:44 UTC 
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
2 parent s e1372c3 + ad2bf0d
History
File Mode Size
sha1.c -rw-r--r-- 1.4 KB
sha1.h -rw-r--r-- 579 bytes
sha1ppc.S -rw-r--r-- 7.3 KB
back to top