зеркало из https://github.com/microsoft/git.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>
This commit is contained in:
Родитель
c4203212e3
Коммит
2dee7e6105
|
@ -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);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
Загрузка…
Ссылка в новой задаче