Re: [PATCH v7 20/31] merge-recursive: check for directory level conflicts

From

Stefan Beller <sbeller@google.com>

Date

Feb 5, 2018, 20:00 UTC

Message-ID

<CAGZ79ka+Dd8Hr_CZwnkpYLnc38CiHPLe18OAbzjHBGUFv+Da5g@mail.gmail.com>

In-Reply-To

<20180130232533.25846-21-newren@gmail.com>

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];