diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-02-26 18:10:24 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-02-26 18:10:24 -0800 |
| commit | 274400998b0a2da64d20e9fa95b288bf1403459c (patch) | |
| tree | 520059d779f2d3e93ab4ba91e4bc9e0bb8d37313 /merge-ll.c | |
| parent | cf47fb7ec7e183a1a1e521a540862fba3c2a89eb (diff) | |
| parent | f0e578c69cd91a554179c09dab6989f6eb0e2910 (diff) | |
| download | git-274400998b0a2da64d20e9fa95b288bf1403459c.tar.gz | |
Merge branch 'rs/use-xstrncmpz'
Code clean-up.
* rs/use-xstrncmpz:
use xstrncmpz()
Diffstat (limited to 'merge-ll.c')
| -rw-r--r-- | merge-ll.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-ll.c b/merge-ll.c index 5ffb045efb..61e0ae5398 100644 --- a/merge-ll.c +++ b/merge-ll.c @@ -292,7 +292,7 @@ static int read_merge_config(const char *var, const char *value, * after seeing merge.<name>.var1. */ for (fn = ll_user_merge; fn; fn = fn->next) - if (!strncmp(fn->name, name, namelen) && !fn->name[namelen]) + if (!xstrncmpz(fn->name, name, namelen)) break; if (!fn) { CALLOC_ARRAY(fn, 1); |