From: Kevin Willford <kewillf@microsoft.com>
Date: Thu, 7 Sep 2017 16:25:56 +0000 (-0600)
Subject: merge-recursive: change current file dir string_lists to hashmap
X-Git-Tag: v2.15.0-rc0~81^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/fc65b00da7ebfc96d3b93a59ee99f820deb5c93e?hp=fc65b00da7ebfc96d3b93a59ee99f820deb5c93e

merge-recursive: change current file dir string_lists to hashmap

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 save some time when there are
millions of paths that will be checked.

Signed-off-by: Kevin Willford <kewillf@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---