diff options
| author |  René Scharfe <l.s.r@web.de> | 2021-08-28 23:30:49 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-08-30 09:44:12 -0700 |
| commit | 2dee7e61053ada0197512b71e02581857e2f1b50 (patch) | |
| tree | 36c269249c49ba103816a790ff7628d30e9c817a | |
| parent | The first batch post 2.33 (diff) | |
| download | tgif-2dee7e61053ada0197512b71e02581857e2f1b50.tar.xz | |
merge-recursive: use fspathcmp() in path_hashmap_cmp()
Call fspathcmp() instead of open-coding it. This shortens the code and
makes it less repetitive.
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -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); } /* |