projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e3d4ff0 ad2bf0d)
Merge branch 'en/rerere-multi-stage-1-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 24 Sep 2018 17:30:48 +0000 (10:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 24 Sep 2018 17:30:48 +0000 (10:30 -0700)
commitbd3941a0aed0756aba43f504d0dea7a3fbe0c82b
tree17d9c22f6491f77904aa727ccfc833c9150d441btree | snapshot
parente3d4ff037db41234eaf74167ab7d1a443c23243dcommit | diff
parentad2bf0d9b43433583e88128c278ce31c7ca4e431commit | diff
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
rerere.c diff1 | diff2 | blob | history
t/t4200-rerere.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.