From: Josip Sokcevic <sokcevic@google.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: jonathantanmy@google.com, git@vger.kernel.org, git@jeffhostetler.com
Subject: Re: [PATCH v3] diff-lib: Fix check_removed when fsmonitor is on
Date: Thu, 14 Sep 2023 15:39:13 -0700 [thread overview]
Message-ID: <CAJiyOiidpD5eNvxVV8rZP7Xej4_8bBfgTOG75T8PVsmvwya3hg@mail.gmail.com> (raw)
In-Reply-To: <xmqqfs3jpbg2.fsf@gitster.g>
On Tue, Sep 12, 2023 at 10:07 AM Junio C Hamano <gitster@pobox.com> wrote:
> It seems to be entirely doable, even though the stench from the
> abstraction layer violation may be horrible.
>
> ie_match_stat(), which is called by match_stat_with_submodule(),
> does pay attention to CE_FSMONITOR_VALID bit, so none of the members
> of struct stat matters when the bit is set. But the bit is not set,
> all members that fill_stat_data() and ce_match_stat_basic() care
> about do matter. Other code that follows callers of check_removed()
> do care about at least .st_mode member, and I suspect that in the
> current code .st_mode is the only member that gets looked at.
>
> So after all, I think your original "fix" was correct, but it took
> us some time to figure out why it was, which means we would want to
> explain it in the log message for developers who would want to touch
> the same area in the future.
I finished testing this - after my original fix and after running all
tests, I can confirm that `st_mode` of `struct stat` is indeed not
consumed if CE_FSMONITOR_VALID is set. But, it's fragile and likely to
cause problems in the future. Your approach of constructing `struct
stat` based on `struct cache_entry` is the way to go.
I see you created a new set of patches in a separate thread, so I'll
start those tests and report back there.
Thanks!
--
Josip Sokcevic
next prev parent reply other threads:[~2023-09-14 22:39 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-29 0:56 Strange diff-index with fsmonitor, submodules Jonathan Tan
2023-08-29 1:20 ` Junio C Hamano
2023-08-29 12:45 ` Jeff Hostetler
2023-08-29 16:57 ` Jeff Hostetler
2023-08-29 17:01 ` Jonathan Tan
2023-09-06 6:02 ` [PATCH] [diff-lib] Fix check_removed when fsmonitor is on Josip Sokcevic
2023-09-06 20:37 ` Jonathan Tan
2023-09-07 17:01 ` [PATCH v2] diff-lib: " Josip Sokcevic
2023-09-07 17:22 ` Jonathan Tan
2023-09-07 18:07 ` Junio C Hamano
2023-09-07 23:08 ` Josip Sokcevic
2023-09-08 15:00 ` Junio C Hamano
2023-09-11 17:09 ` [PATCH v3] " Josip Sokcevic
2023-09-11 22:53 ` Junio C Hamano
2023-09-12 3:03 ` Josip Sokcevic
2023-09-12 17:07 ` Junio C Hamano
2023-09-14 22:39 ` Josip Sokcevic [this message]
2023-09-18 16:35 ` 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=CAJiyOiidpD5eNvxVV8rZP7Xej4_8bBfgTOG75T8PVsmvwya3hg@mail.gmail.com \
--to=sokcevic@google.com \
--cc=git@jeffhostetler.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jonathantanmy@google.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).