From: René Scharfe <l.s.r@web.de>
Date: Sat, 28 Aug 2021 21:30:49 +0000 (+0200)
Subject: merge-recursive: use fspathcmp() in path_hashmap_cmp()
X-Git-Tag: v2.34.0-rc0~190^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2dee7e61053ada0197512b71e02581857e2f1b50;p=thirdparty%2Fgit.git

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>
---

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);
 }
 
 /*