On Wed, Jan 31, 2018 at 1:43 PM, Ayke van Laethem <aykevanlaet...@gmail.com> wrote: > Hi all, > > I've found a segmentation fault in git. > > Here, fabsf is a branch that I'm trying to get the topmost commit from. > After the failed cherry-pick, the change is added to the local working > tree, but the commit isn't applied and .git/index.lock still exists. > > Version: 2.11.0 (Debian stretch) > > ~/src/micropython/ports/nrf$ valgrind git cherry-pick fabsf > ==23286== Memcheck, a memory error detector > ==23286== Copyright (C) 2002-2015, and GNU GPL'd, by Julian Seward et al. > ==23286== Using Valgrind-3.12.0.SVN and LibVEX; rerun with -h for copyright > info > ==23286== Command: git cherry-pick fabsf > ==23286== > ==23286== Invalid read of size 4 > ==23286== at 0x21A348: add_index_entry_with_check (read-cache.c:1012) > ==23286== by 0x21A348: add_index_entry (read-cache.c:1061) > ==23286== by 0x1FAE85: merge_content (merge-recursive.c:1727)
This looks like the stack trace in https://github.com/git-for-windows/git/issues/952, which was fixed by Johannes Schindelin in commit 55e9f0e5c ("merge-recursive: handle NULL in add_cacheinfo() correctly", 2016-11-26). Could you retry with a newer version of git? Elijah
