Hi, On Fri, 25 Nov 2016, Johannes Schindelin wrote:
> The culprit is actually not cherry-pick, but a special code path that > expects refresh_cache_entry() not to return NULL. And the fix is to > teach it to handle NULL there. > > This bug was brought to my attention by Markus Klein via > https://github.com/git-for-windows/git/issues/952. For the record, I looked at other callers of `refresh_cache_entry()`: there is only `make_cache_entry()`, whose callers all handle NULL return values except in resolve-undo.c. But that latter caller is okay because it specifically does not allow refreshing (by passing 0 as options), so refresh_cache_entry() cannot return NULL. Ciao, Dscho
