Re: [PATCH v2 3/6] ls-files: don't needlessly pass around stage variable
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Mar 8, 2021, 18:18 UTC
- Message-ID
- <xmqq1rcp7bmp.fsf@gitster.c.googlers.com>
- In-Reply-To
- <20210308022138.28166-4-avarab@gmail.com>
Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:
Show 32 quoted lines
> Now that read_tree() has been moved to ls-files.c we can get rid of
> the stage != 1 case that'll never happen.
>
> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> ---
> builtin/ls-files.c | 17 ++++-------------
> 1 file changed, 4 insertions(+), 13 deletions(-)
>
> diff --git a/builtin/ls-files.c b/builtin/ls-files.c
> index a4458622813..74d572a3e4a 100644
> --- a/builtin/ls-files.c
> +++ b/builtin/ls-files.c
> @@ -470,21 +470,12 @@ static int read_one_entry_quick(const struct object_id *oid, struct strbuf *base
> }
>
>
> -static int read_tree(struct repository *r, struct tree *tree, int stage,
> +static int read_tree(struct repository *r, struct tree *tree,
> struct pathspec *match, struct index_state *istate)
> {
> read_tree_fn_t fn = NULL;
> int i, err;
>
> - /*
> - * Currently the only existing callers of this function all
> - * call it with stage=1 and after making sure there is nothing
> - * at that stage; we could always use read_one_entry_quick().
> - *
> - * But when we decide to straighten out git-read-tree not to
> - * use unpack_trees() in some cases, this will probably start
> - * to matter.
> - */The "hoist everything to stage#1, read and compare" the commit that introduced this comment talks about (cf. af3785dc5a7) was entirely rewritten by d1f2d7e8 (Make run_diff_index() use unpack_trees(), not read_tree(), 2008-01-19); this clean-up is long overdue.
Looking good.
Show 27 quoted lines
> /*
> * See if we have cache entry at the stage. If so,
> @@ -493,13 +484,13 @@ static int read_tree(struct repository *r, struct tree *tree, int stage,
> */
> for (i = 0; !fn && i < istate->cache_nr; i++) {
> const struct cache_entry *ce = istate->cache[i];
> - if (ce_stage(ce) == stage)
> + if (ce_stage(ce) == 1)
> fn = read_one_entry;
> }
>
> if (!fn)
> fn = read_one_entry_quick;
> - err = read_tree_recursive(r, tree, "", 0, stage, match, fn, istate);
> + err = read_tree_recursive(r, tree, "", 0, 1, match, fn, istate);
> if (fn == read_one_entry || err)
> return err;
>
> @@ -549,7 +540,7 @@ void overlay_tree_on_index(struct index_state *istate,
> PATHSPEC_PREFER_CWD, prefix, matchbuf);
> } else
> memset(&pathspec, 0, sizeof(pathspec));
> - if (read_tree(the_repository, tree, 1, &pathspec, istate))
> + if (read_tree(the_repository, tree, &pathspec, istate))
> die("unable to read tree entries %s", tree_name);
>
> for (i = 0; i < istate->cache_nr; i++) {