[PATCH v2 4/6] verify_one_sparse(): drop unused repository parameter
- From
Jeff King <peff@peff.net>
- Date
- Aug 20, 2022, 09:02 UTC
- Message-ID
- <YwCjOETsh1o8u0Og@coredump.intra.peff.net>
- In-Reply-To
- <9829e1cf-21aa-0c10-0b64-c8a2ffdbc943@web.de>
On Sat, Aug 20, 2022 at 10:48:47AM +0200, René Scharfe wrote:
Show 16 quoted lines
> > diff --git a/cache-tree.c b/cache-tree.c > > index 56db0b5026..c97111cccf 100644 > > --- a/cache-tree.c > > +++ b/cache-tree.c > > @@ -857,9 +857,7 @@ int cache_tree_matches_traversal(struct cache_tree *root, > > return 0; > > } > > > > -static void verify_one_sparse(struct repository *r, > > - struct index_state *istate, > > - struct cache_tree *it, > > +static void verify_one_sparse(struct index_state *istate, > > This also removes the cache_tree parameter, which has never been used as > well, but is not mentioned in the commit message. A good change, to be > sure.
Good catch. I wrote the patch itself over a year ago (whenever the commit made it into 'next' and failed my compilation), but I didn't write the commit message until recently. And when re-reading the patch I totally missed that _two_ parameters went away.
Given that and Stolee's earlier comment, here's a proposed commit message that explains it better:
-- >8 -- Subject: verify_one_sparse(): drop unused parameters
This function has never used its repository or cache_tree parameters since it was introduced in 9ad2d5ea71 (sparse-index: loose integration with cache_tree_verify(), 2021-03-30).
As that commit notes, it may eventually be extended further, and that might require looking at more data. But we can easily add them back if necessary (and the repository is even included in the index_state these days already). In the mean time, dropping them makes the code shorter and appeases -Wunused-parameter.
Signed-off-by: Jeff King <peff@peff.net> --- cache-tree.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/cache-tree.c b/cache-tree.c index 56db0b5026..c97111cccf 100644 --- a/cache-tree.c +++ b/cache-tree.c @@ -857,9 +857,7 @@ int cache_tree_matches_traversal(struct cache_tree *root, return 0; } -static void verify_one_sparse(struct repository *r, - struct index_state *istate, - struct cache_tree *it, +static void verify_one_sparse(struct index_state *istate, struct strbuf *path, int pos) { @@ -910,7 +908,7 @@ static int verify_one(struct repository *r, return 1; if (pos >= 0) { - verify_one_sparse(r, istate, it, path, pos); + verify_one_sparse(istate, path, pos); return 0; }
-- 2.37.2.964.g6266ca593d