]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e1372c3 ad2bf0d)
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)
commitb4eafbcdb84fc406bff37f06fdf6310aca7d0249
tree89f6f96f46f64695ac84ad9a49e14017e573ef77tree | snapshot
parente1372c37de9bbca8a96db10fe8ab7b3a420c9108commit | diff
parentad2bf0d9b43433583e88128c278ce31c7ca4e431commit | 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
Unnamed repository; edit this file 'description' to name the repository.