diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2016-11-26 13:48:02 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-11-28 10:46:28 -0800 |
| commit | 05f2dfb965476a59050b7c3446b1281bdcac7051 (patch) | |
| tree | c1036fddbbdfb0d4495505d936c158b1fefc9ebc /merge-recursive.c | |
| parent | 1335d76e4569fa84e52dc24c88c04daeae6e160e (diff) | |
| download | git-05f2dfb965476a59050b7c3446b1281bdcac7051.tar.gz git-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 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions