summaryrefslogtreecommitdiff
path: root/diff-delta.c
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2016-11-26 13:48:02 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-11-28 10:46:28 -0800
commit05f2dfb965476a59050b7c3446b1281bdcac7051 (patch)
treec1036fddbbdfb0d4495505d936c158b1fefc9ebc /diff-delta.c
parentmerge: avoid "safer crlf" during recording of merge results (diff)
downloadtgif-05f2dfb965476a59050b7c3446b1281bdcac7051.tar.xz
cherry-pick: demonstrate a segmentation fault
In https://github.com/git-for-windows/git/issues/952, a complicated scenario was described that leads to a segmentation fault in cherry-pick. It boils down to a certain code path involving a renamed file that is dirty, for which `refresh_cache_entry()` returns `NULL`, and that `NULL` not being handled properly. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff-delta.c')
0 files changed, 0 insertions, 0 deletions