diff options
author | Martin Ågren <martin.agren@gmail.com> | 2022-01-10 19:41:34 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-01-10 11:30:33 -0800 |
commit | 97d6fb5a1f5c854d87fd3fd98722c469a9195a46 (patch) | |
tree | d381276c421e974046fb5c3a907a2a7291f7e8ed /t/t3430-rebase-merges.sh | |
parent | Git 2.34.1 (diff) | |
download | tgif-97d6fb5a1f5c854d87fd3fd98722c469a9195a46.tar.xz |
cache.h: drop duplicate `ensure_full_index()` declaration
There are two identical declarations of `ensure_full_index()` in
cache.h.
Commit 3964fc2aae ("sparse-index: add guard to ensure full index",
2021-03-30) provided an empty implementation of `ensure_full_index()`,
declaring it in a new file sparse-index.h. When commit 4300f8442a
("sparse-index: implement ensure_full_index()", 2021-03-30) fleshed out
the implementation, it added an identical declaration to cache.h.
Then 118a2e8bde ("cache: move ensure_full_index() to cache.h",
2021-04-01) favored having the declaration in cache.h. Because of the
double declaration, at that point we could have just dropped the one in
sparse-index.h, but instead it got moved to cache.h.
As a result, cache.h contains the exact same function declaration twice.
Drop the one under "/* Name hashing */", in favor of the one under
"/* Initialize and use the cache information */".
Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Acked-by: Victoria Dye <vdye@github.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3430-rebase-merges.sh')
0 files changed, 0 insertions, 0 deletions