From: Derrick Stolee <stolee@gmail.com>
To: Junio C Hamano <gitster@pobox.com>, Elijah Newren <newren@gmail.com>
Cc: Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com>,
Git Mailing List <git@vger.kernel.org>,
Derrick Stolee <derrickstolee@github.com>,
Derrick Stolee <dstolee@microsoft.com>
Subject: Re: [PATCH v3 2/9] cache-tree: simplify verify_cache() prototype
Date: Sat, 23 Jan 2021 16:14:36 -0500 [thread overview]
Message-ID: <51dc4a80-1bea-a028-ccd1-ccae968a82a3@gmail.com> (raw)
In-Reply-To: <xmqqy2gj2wc0.fsf@gitster.c.googlers.com>
On 1/23/2021 4:10 PM, Junio C Hamano wrote:
> Elijah Newren <newren@gmail.com> writes:
>
>>> - for (i = 0; i < entries - 1; i++) {
>>> + for (i = 0; i + 1 < istate->cache_nr; i++) {
>>> /* path/file always comes after path because of the way
>>> * the cache is sorted. Also path can appear only once,
>>> * which means conflicting one would immediately follow.
>>> */
>>> - const struct cache_entry *this_ce = cache[i];
>>> - const struct cache_entry *next_ce = cache[i + 1];
>>> + const struct cache_entry *this_ce = istate->cache[i];
>>> + const struct cache_entry *next_ce = istate->cache[i + 1];
>>
>> Makes sense. Thanks for explaining the i + 1 < istate->cache_nr bit
>> in the commit message; made it easier to read through quickly. I'm
>> curious if it deserves a comment in the code too, since it does feel
>> slightly unusual.
>
> I think this is entirely my fault.
>
> It probably reads more natural to start from 1 and interate through
> to the end of the array, comparing the current one with the previous
> entry, i.e.
>
> for (i = 1; i < istate->cache_nr; i++) {
> prev = cache[i - 1];
> this = cache[i];
> compare(prev, this);
This would be another natural way to make the loop extremely clear.
It's a bigger diff, changing the names of 'this' and 'next', but
perhaps worthwhile.
Thanks,
-Stolee
next prev parent reply other threads:[~2021-01-23 21:15 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-20 16:53 [PATCH 0/9] More index cleanups Derrick Stolee via GitGitGadget
2021-01-20 16:53 ` [PATCH 1/9] cache-tree: clean up cache_tree_update() Derrick Stolee via GitGitGadget
2021-01-20 17:21 ` Elijah Newren
2021-01-20 19:10 ` Derrick Stolee
2021-01-20 16:53 ` [PATCH 2/9] cache-tree: extract subtree_pos() Derrick Stolee via GitGitGadget
2021-01-20 17:23 ` Elijah Newren
2021-01-20 16:53 ` [PATCH 3/9] fsmonitor: de-duplicate BUG()s around dirty bits Derrick Stolee via GitGitGadget
2021-01-20 17:26 ` Elijah Newren
2021-01-21 12:53 ` Chris Torek
2021-01-21 15:56 ` Derrick Stolee
2021-01-20 16:53 ` [PATCH 4/9] repository: add repo reference to index_state Derrick Stolee via GitGitGadget
2021-01-20 17:46 ` Elijah Newren
2021-01-20 19:16 ` Derrick Stolee
2021-01-20 19:50 ` Elijah Newren
2021-01-20 16:53 ` [PATCH 5/9] name-hash: use trace2 regions for init Derrick Stolee via GitGitGadget
2021-01-20 17:47 ` Elijah Newren
2021-01-20 16:53 ` [PATCH 6/9] sparse-checkout: load sparse-checkout patterns Derrick Stolee via GitGitGadget
2021-01-20 17:54 ` Elijah Newren
2021-01-20 16:53 ` [PATCH 7/9] sparse-checkout: hold pattern list in index Derrick Stolee via GitGitGadget
2021-01-20 18:03 ` Elijah Newren
2021-01-20 19:22 ` Derrick Stolee
2021-01-20 16:53 ` [PATCH 8/9] test-lib: test_region looks for trace2 regions Derrick Stolee via GitGitGadget
2021-01-20 18:20 ` Elijah Newren
2021-01-20 19:24 ` Derrick Stolee
2021-01-20 16:53 ` [PATCH 9/9] t1092: test interesting sparse-checkout scenarios Derrick Stolee via GitGitGadget
2021-01-20 19:40 ` Elijah Newren
2021-01-21 11:59 ` Derrick Stolee
2021-01-22 13:03 ` [PATCH v2 0/8] More index cleanups Derrick Stolee via GitGitGadget
2021-01-22 13:03 ` [PATCH v2 1/8] cache-tree: clean up cache_tree_update() Derrick Stolee via GitGitGadget
2021-01-22 19:11 ` Junio C Hamano
2021-01-22 13:03 ` [PATCH v2 2/8] cache-tree: extract subtree_pos() Derrick Stolee via GitGitGadget
2021-01-22 13:03 ` [PATCH v2 3/8] fsmonitor: de-duplicate BUG()s around dirty bits Derrick Stolee via GitGitGadget
2021-01-22 19:18 ` Junio C Hamano
2021-01-22 13:03 ` [PATCH v2 4/8] repository: add repo reference to index_state Derrick Stolee via GitGitGadget
2021-01-22 19:23 ` Junio C Hamano
2021-01-22 13:03 ` [PATCH v2 5/8] name-hash: use trace2 regions for init Derrick Stolee via GitGitGadget
2021-01-22 13:03 ` [PATCH v2 6/8] sparse-checkout: load sparse-checkout patterns Derrick Stolee via GitGitGadget
2021-01-22 13:03 ` [PATCH v2 7/8] test-lib: test_region looks for trace2 regions Derrick Stolee via GitGitGadget
2021-01-22 19:42 ` Junio C Hamano
2021-01-23 18:36 ` Derrick Stolee
2021-01-23 18:50 ` Junio C Hamano
2021-01-22 13:03 ` [PATCH v2 8/8] t1092: test interesting sparse-checkout scenarios Derrick Stolee via GitGitGadget
2021-01-22 19:49 ` [PATCH v2 0/8] More index cleanups Elijah Newren
2021-01-23 18:47 ` Derrick Stolee
2021-01-23 19:58 ` [PATCH v3 0/9] " Derrick Stolee via GitGitGadget
2021-01-23 19:58 ` [PATCH v3 1/9] cache-tree: clean up cache_tree_update() Derrick Stolee via GitGitGadget
2021-01-23 19:58 ` [PATCH v3 2/9] cache-tree: simplify verify_cache() prototype Derrick Stolee via GitGitGadget
2021-01-23 20:24 ` Elijah Newren
2021-01-23 21:02 ` Derrick Stolee
2021-01-23 21:10 ` Elijah Newren
2021-01-23 21:41 ` Junio C Hamano
2021-01-23 21:10 ` Junio C Hamano
2021-01-23 21:14 ` Derrick Stolee [this message]
2021-01-23 19:58 ` [PATCH v3 3/9] cache-tree: extract subtree_pos() Derrick Stolee via GitGitGadget
2021-01-23 19:58 ` [PATCH v3 4/9] fsmonitor: de-duplicate BUG()s around dirty bits Derrick Stolee via GitGitGadget
2021-01-23 19:58 ` [PATCH v3 5/9] repository: add repo reference to index_state Derrick Stolee via GitGitGadget
2021-01-23 19:58 ` [PATCH v3 6/9] name-hash: use trace2 regions for init Derrick Stolee via GitGitGadget
2021-01-23 19:58 ` [PATCH v3 7/9] sparse-checkout: load sparse-checkout patterns Derrick Stolee via GitGitGadget
2021-01-23 19:58 ` [PATCH v3 8/9] test-lib: test_region looks for trace2 regions Derrick Stolee via GitGitGadget
2021-01-23 21:07 ` Derrick Stolee
2021-01-23 19:58 ` [PATCH v3 9/9] t1092: test interesting sparse-checkout scenarios Derrick Stolee via GitGitGadget
2021-01-25 18:45 ` Elijah Newren
2021-01-23 20:29 ` [PATCH v3 0/9] More index cleanups Elijah Newren
2021-01-23 21:05 ` Derrick Stolee
2021-01-23 21:42 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=51dc4a80-1bea-a028-ccd1-ccae968a82a3@gmail.com \
--to=stolee@gmail.com \
--cc=derrickstolee@github.com \
--cc=dstolee@microsoft.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=newren@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).