diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2021-01-07 12:51:50 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-01-08 02:13:21 +0300 |
| commit | d0947483a3386204918447775b617ab3dac833b0 (patch) | |
| tree | ebf413353ed17df3676a4ed77533e742f0bcf634 /ref-filter.c | |
| parent | 75c50e599ca4fe2fcf864cfa491c8035513e6cdb (diff) | |
ref-filter: move "cmp_fn" assignment into "else if" arm
Further amend code changed in 7c5045fc180 (ref-filter: apply fallback
refname sort only after all user sorts, 2020-05-03) to move an
assignment only used in the "else if" arm to happen there. Before that
commit the cmp_fn would be used outside of it.
We could also just skip the "cmp_fn" assignment and use
strcasecmp/strcmp directly in a ternary statement here, but this is
probably more readable.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'ref-filter.c')
| -rw-r--r-- | ref-filter.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ref-filter.c b/ref-filter.c index e4c162a8c3..8882128cd3 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -2355,7 +2355,6 @@ static int cmp_ref_sorting(struct ref_sorting *s, struct ref_array_item *a, stru struct atom_value *va, *vb; int cmp; cmp_type cmp_type = used_atom[s->atom].type; - int (*cmp_fn)(const char *, const char *); struct strbuf err = STRBUF_INIT; if (get_ref_atom_value(a, s->atom, &va, &err)) @@ -2363,10 +2362,11 @@ static int cmp_ref_sorting(struct ref_sorting *s, struct ref_array_item *a, stru if (get_ref_atom_value(b, s->atom, &vb, &err)) die("%s", err.buf); strbuf_release(&err); - cmp_fn = s->ignore_case ? strcasecmp : strcmp; if (s->version) { cmp = versioncmp(va->s, vb->s); } else if (cmp_type == FIELD_STR) { + int (*cmp_fn)(const char *, const char *); + cmp_fn = s->ignore_case ? strcasecmp : strcmp; cmp = cmp_fn(va->s, vb->s); } else { if (va->value < vb->value) |