Re: [PATCH 3/3] merge-recursive: change current file dir string_lists to hashmap

2017-09-05 Thread Junio C Hamano
I needed this squashed into before I could even compile the resulting code. Perhaps my compiler is stale? merge-recursive.c:28:22: error: declaration does not declare anything [-Werror] struct hashmap_entry; ^ merge-recursive.c:29:7: error: flexible array member in

Re: [PATCH 3/3] merge-recursive: change current file dir string_lists to hashmap

2017-08-29 Thread Jeff King
On Mon, Aug 28, 2017 at 02:28:29PM -0600, Kevin Willford wrote: > The code was using two string_lists, one for the directories and > one for the files. The code never checks the lists independently > so we should be able to only use one list. The string_list also > is a O(log n) for lookup and

Re: [PATCH 3/3] merge-recursive: change current file dir string_lists to hashmap

2017-08-28 Thread Ben Peart
On 8/28/2017 4:28 PM, Kevin Willford wrote: The code was using two string_lists, one for the directories and one for the files. The code never checks the lists independently so we should be able to only use one list. The string_list also is a O(log n) for lookup and insertion. Switching

[PATCH 3/3] merge-recursive: change current file dir string_lists to hashmap

2017-08-28 Thread Kevin Willford
The code was using two string_lists, one for the directories and one for the files. The code never checks the lists independently so we should be able to only use one list. The string_list also is a O(log n) for lookup and insertion. Switching this to use a hashmap will give O(1) which will