Show 25 quoted lines
> On Sun, Jul 16, 2017 at 01:06:45PM +0200, René Scharfe wrote:
>
>>>> diff --git a/builtin/ls-files.c b/builtin/ls-files.c
>>>> index b8514a0029..adf572da68 100644
>>>> --- a/builtin/ls-files.c
>>>> +++ b/builtin/ls-files.c
>>>> @@ -362,7 +362,7 @@ static void prune_index(struct index_state *istate,
>>>> int pos;
>>>> unsigned int first, last;
>>>>
>>>> - if (!prefix)
>>>> + if (!prefix || !istate->cache_nr)
>>>> return;
>>>> pos = index_name_pos(istate, prefix, prefixlen);
>>>> if (pos < 0)
>>>
>>> "git am" complained that this does not apply to its blobs. Did you
>>> hand-edit?
>>
>> I didn't, but perhaps I messed up the order of patches? MOVE_ARRAY
>> patch 2 touches the same file, but I wouldn't expect the two changes to
>> conflict. So not sure what's going on.
>
> For some reason there's an extra space before the tab on each of the
> context lines. MUA issue or cut-and-paste, maybe?