diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-08-04 13:28:54 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-08-04 13:28:54 -0700 |
commit | 4dc964691f83543d2e4b508e0354a431dbb528ce (patch) | |
tree | c02fdcd3b1eb2a56fdf9fa37f3b2d9b754439290 /dir.c | |
parent | Merge branch 'pb/merge-autostash-more' (diff) | |
parent | use fspathhash() everywhere (diff) | |
download | tgif-4dc964691f83543d2e4b508e0354a431dbb528ce.tar.xz |
Merge branch 'rs/use-fspathhash'
Code simplification.
* rs/use-fspathhash:
use fspathhash() everywhere
Diffstat (limited to 'dir.c')
-rw-r--r-- | dir.c | 13 |
1 files changed, 3 insertions, 10 deletions
@@ -782,9 +782,7 @@ static void add_pattern_to_hashsets(struct pattern_list *pl, struct path_pattern translated->pattern = truncated; translated->patternlen = given->patternlen - 2; hashmap_entry_init(&translated->ent, - ignore_case ? - strihash(translated->pattern) : - strhash(translated->pattern)); + fspathhash(translated->pattern)); if (!hashmap_get_entry(&pl->recursive_hashmap, translated, ent, NULL)) { @@ -813,9 +811,7 @@ static void add_pattern_to_hashsets(struct pattern_list *pl, struct path_pattern translated->pattern = dup_and_filter_pattern(given->pattern); translated->patternlen = given->patternlen; hashmap_entry_init(&translated->ent, - ignore_case ? - strihash(translated->pattern) : - strhash(translated->pattern)); + fspathhash(translated->pattern)); hashmap_add(&pl->recursive_hashmap, &translated->ent); @@ -845,10 +841,7 @@ static int hashmap_contains_path(struct hashmap *map, /* Check straight mapping */ p.pattern = pattern->buf; p.patternlen = pattern->len; - hashmap_entry_init(&p.ent, - ignore_case ? - strihash(p.pattern) : - strhash(p.pattern)); + hashmap_entry_init(&p.ent, fspathhash(p.pattern)); return !!hashmap_get_entry(map, &p, ent, NULL); } |