From: Elijah Newren <newren@gmail.com>
Date: Mon, 05 Feb 2018 21:12:39 GMT
Subject: Re: [PATCH v7 20/31] merge-recursive: check for directory level conflicts
Message-ID: <CABPp-BEYomu+RsGzLvTUtFYM8ZjUSod8BXfLFUebxGSiT8m49A@mail.gmail.com>
In-Reply-To: <CAGZ79ka+Dd8Hr_CZwnkpYLnc38CiHPLe18OAbzjHBGUFv+Da5g@mail.gmail.com>

On Mon, Feb 5, 2018 at 12:00 PM, Stefan Beller <sbeller@google.com> wrote:
> On Tue, Jan 30, 2018 at 3:25 PM, Elijah Newren <newren@gmail.com> wrote:
>> Before trying to apply directory renames to paths within the given
>> directories, we want to make sure that there aren't conflicts at the
>> directory level.  There will be additional checks at the individual
>> file level too, which will be added later.
>
>
>> +static int tree_has_path(struct tree *tree, const char *path)
>> +{
>> +       unsigned char hashy[20];
>
> What is 20? ;)
> I think you want to use GIT_MAX_RAWSZ instead.

Indeed, thanks!