]> git.ipfire.org Git - thirdparty/git.git/commitdiff
sparse-index.c: expand_to_path() can assume non-NULL "istate"
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Thu, 12 Jan 2023 12:55:24 +0000 (13:55 +0100)
committerJunio C Hamano <gitster@pobox.com>
Fri, 13 Jan 2023 18:36:57 +0000 (10:36 -0800)
This function added in [1] was subsequently used in [2]. All of the
calls to it are in name-hash.c, and come after calls to
lazy_init_name_hash(istate). The first thing that function does is:

if (istate->name_hash_initialized)
return;

So we can already assume that we have a non-NULL "istate" here, or
we'd be segfaulting. Let's not confuse matters by making it appear
that's not the case.

1. 71f82d032f3 (sparse-index: expand_to_path(), 2021-04-12)
2. 4589bca829a (name-hash: use expand_to_path(), 2021-04-12)

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Acked-by: Derrick Stolee <derrickstolee@github.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
sparse-index.c

index 8c269dab803fa9a06a0e31ff42b6a20ec1983dbc..65a08d33c73e84428db386fa92641f59cda0b02f 100644 (file)
@@ -547,7 +547,7 @@ void expand_to_path(struct index_state *istate,
        if (in_expand_to_path)
                return;
 
-       if (!istate || !istate->sparse_index)
+       if (!istate->sparse_index)
                return;
 
        if (!istate->repo)