Re: [PATCH v10 18/36] merge-recursive: add get_directory_renames()

2019-10-12 Thread Johannes Schindelin
Hi Elijah, On Fri, 11 Oct 2019, Elijah Newren wrote: > On Wed, Oct 9, 2019 at 1:39 PM Johannes Schindelin > wrote: > > > > sorry about the blast from the past, but I just stumbled over something > > I could not even find any discussion about: > > I'm curious what brought you to this part of the

Re: [PATCH v10 18/36] merge-recursive: add get_directory_renames()

2019-10-11 Thread Elijah Newren
// Dropping a few folks from the cc list as the thread is so old that I think it should just be the normal git mailing list. Hi Dscho, On Wed, Oct 9, 2019 at 1:39 PM Johannes Schindelin wrote: > > Hi Elijah, > > sorry about the blast from the past, but I just stumbled over something > I could no

Re: [PATCH v10 18/36] merge-recursive: add get_directory_renames()

2019-10-09 Thread Johannes Schindelin
Hi Elijah, sorry about the blast from the past, but I just stumbled over something I could not even find any discussion about: On Thu, 19 Apr 2018, Elijah Newren wrote: > This populates a set of directory renames for us. The set of directory > renames is not yet used, but will be in subsequent

Re: [PATCH v10 18/36] merge-recursive: add get_directory_renames()

2018-05-06 Thread SZEDER Gábor
> diff --git a/merge-recursive.c b/merge-recursive.c > index 30894c1cc7..22c5e8e5c9 100644 > --- a/merge-recursive.c > +++ b/merge-recursive.c > +static struct hashmap *get_directory_renames(struct diff_queue_struct *pairs, > + struct tree *tree) > +{ > +

[PATCH v10 18/36] merge-recursive: add get_directory_renames()

2018-04-19 Thread Elijah Newren
This populates a set of directory renames for us. The set of directory renames is not yet used, but will be in subsequent commits. Note that the use of a string_list for possible_new_dirs in the new dir_rename_entry struct implies an O(n^2) algorithm; however, in practice I expect the number of d