Re: [PATCH v7 20/31] merge-recursive: check for directory level conflicts
From: Elijah Newren <hidden>
Date: 2018-02-05 21:12:45
From: Elijah Newren <hidden>
Date: 2018-02-05 21:12:45
On Mon, Feb 5, 2018 at 12:00 PM, Stefan Beller [off-list ref] wrote:
On Tue, Jan 30, 2018 at 3:25 PM, Elijah Newren [off-list ref] wrote:quoted
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.quoted
+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!