Re: [PATCH v3 21/33] merge-recursive: add get_directory_renames()

On Sat, Nov 25, 2017 at 4:52 PM, Johannes Schindelin wrote: > On Tue, 21 Nov 2017, Elijah Newren wrote: > >> diff --git a/merge-recursive.c b/merge-recursive.c >> + if (old_len != new_len || strncmp(old_path, new_path, old_len)) { >> + *old_dir =

Re: [PATCH v3 21/33] merge-recursive: add get_directory_renames()

Hi Elijah, On Tue, 21 Nov 2017, Elijah Newren wrote: > diff --git a/merge-recursive.c b/merge-recursive.c > index 2f4f85314a..6a0a6d4366 100644 > --- a/merge-recursive.c > +++ b/merge-recursive.c > @@ -1384,6 +1384,132 @@ static struct diff_queue_struct *get_diffpairs(struct > merge_options *o,

[PATCH v3 21/33] merge-recursive: add get_directory_renames()

This populates a list of directory renames for us. The list of directory renames is not yet used, but will be in subsequent commits. Signed-off-by: Elijah Newren --- merge-recursive.c | 152 ++ 1 file changed, 152