undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rs/more-fspathcmp'

Browse Source 
Code simplification.

* rs/more-fspathcmp:
  merge-recursive: use fspathcmp() in path_hashmap_cmp()
This commit is contained in:
Junio C Hamano 2021-09-10 11:46:24 -07:00
commit 0538a2586e
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
merge-recursive.c
View File

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