diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-09-10 11:46:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-10 11:46:24 -0700 |
| commit | 0538a2586e7c4d9fd5ec6ecdc4cf04101ee73a6b (patch) | |
| tree | e1fe89e3b5e7041174a581679b83184b6a5d142d | |
| parent | e4897d2bde2bc6f8a63c468e1ff8617314269dcd (diff) | |
| parent | 2dee7e61053ada0197512b71e02581857e2f1b50 (diff) | |
| download | git-0538a2586e7c4d9fd5ec6ecdc4cf04101ee73a6b.tar.gz | |
Merge branch 'rs/more-fspathcmp'
Code simplification.
* rs/more-fspathcmp:
merge-recursive: use fspathcmp() in path_hashmap_cmp()
| -rw-r--r-- | merge-recursive.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 3355d50e8a..840599fd53 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -55,10 +55,7 @@ static int path_hashmap_cmp(const void *cmp_data, a = container_of(eptr, const struct path_hashmap_entry, e); b = container_of(entry_or_key, const struct path_hashmap_entry, e); - if (ignore_case) - return strcasecmp(a->path, key ? key : b->path); - else - return strcmp(a->path, key ? key : b->path); + return fspathcmp(a->path, key ? key : b->path); } /* |