Skip to content

diff-lib: skip leading path check for fsmonitor-valid entries - #2318

Open
letmaik wants to merge 1 commit into
gitgitgadget:masterfrom
letmaik:diff-lib-fsmonitor-leading-path
Open

letmaik wants to merge 1 commit into
gitgitgadget:masterfrom
letmaik:diff-lib-fsmonitor-leading-path

Conversation

@letmaik

@letmaik letmaik commented Nov 18, 2026 •

Copy link
Copy Markdown

Changes since v1:

  • Dropped the stat_err variable and called lstat() directly in the
    if() condition (suggested by Junio).

CC: Josip Sokcevic sokcevic@google.com

@gitgitgadget

gitgitgadget Bot commented Nov 18, 2026

Copy link
Copy Markdown

Welcome to GitGitGadget

Hi @letmaik, and welcome to GitGitGadget, the GitHub App to send patch series to the Git mailing list from GitHub Pull Requests.

Please make sure that either:

  • Your Pull Request has a good description, if it consists of multiple commits, as it will be used as cover letter.
  • Your Pull Request description is empty, if it consists of a single commit, as the commit message should be descriptive enough by itself.

You can CC potential reviewers by adding a footer to the PR description with the following syntax:

CC: Revi Ewer <revi.ewer@example.com>, Ill Takalook <ill.takalook@example.net>

NOTE: DO NOT copy/paste your CC list from a previous GGG PR's description,
because it will result in a malformed CC list on the mailing list. See
example.

Also, it is a good idea to review the commit messages one last time, as the Git project expects them in a quite specific form:

  • the lines should not exceed 76 columns,
  • the first line should be like a header and typically start with a prefix like "tests:" or "revisions:" to state which subsystem the change is about, and
  • the commit messages' body should be describing the "why?" of the change.
  • Finally, the commit messages should end in a Signed-off-by: line matching the commits' author.

It is in general a good idea to await the automated test ("Checks") in this Pull Request before contributing the patches, e.g. to avoid trivial issues such as unportable code.

Contributing the patches

Before you can contribute the patches, your GitHub username needs to be added to the list of permitted users. Any already-permitted user can do that, by adding a comment to your PR of the form /allow. A good way to find other contributors is to locate recent pull requests where someone has been /allowed:

Both the person who commented /allow and the PR author are able to /allow you.

An alternative is the channel #git-devel on the Libera Chat IRC network:

<newcontributor> I've just created my first PR, could someone please /allow me? https://github.com/gitgitgadget/git/pull/12345
<veteran> newcontributor: it is done
<newcontributor> thanks!

Once on the list of permitted usernames, you can contribute the patches to the Git mailing list by adding a PR comment /submit.

If you want to see what email(s) would be sent for a /submit request, add a PR comment /preview to have the email(s) sent to you. You must have a public GitHub email address for this. Note that any reviewers CC'd via the list in the PR description will not actually be sent emails.

After you submit, GitGitGadget will respond with another comment that contains the link to the cover letter mail in the Git mailing list archive. Please make sure to monitor the discussion in that thread and to address comments and suggestions (while the comments and suggestions will be mirrored into the PR by GitGitGadget, you will still want to reply via mail).

If you do not want to subscribe to the Git mailing list just to be able to respond to a mail, you can download the mbox from the Git mailing list archive (click the (raw) link), then import it into your mail program. If you use GMail, you can do this via:

curl -g --user "<EMailAddress>:<Password>" \
    --url "imaps://imap.gmail.com/INBOX" -T /path/to/raw.txt

To iterate on your change, i.e. send a revised patch or patch series, you will first want to (force-)push to the same branch. You probably also want to modify your Pull Request description (or title). It is a good idea to summarize the revision by adding something like this to the cover letter (read: by editing the first comment on the PR, i.e. the PR description):

Changes since v1:
- Fixed a typo in the commit message (found by ...)
- Added a code comment to ... as suggested by ...
...

To send a new iteration, just add another PR comment with the contents: /submit.

Need help?

New contributors who want advice are encouraged to join git-mentoring@googlegroups.com, where volunteers who regularly contribute to Git are willing to answer newbie questions, give advice, or otherwise provide mentoring to interested contributors. You must join in order to post or view messages, but anyone can join.

You may also be able to find help in real time in the developer IRC channel, #git-devel on Libera Chat. Remember that IRC does not support offline messaging, so if you send someone a private message and log out, they cannot respond to you. The scrollback of #git-devel is archived, though.

@dscho

dscho commented Nov 18, 2026

Copy link
Copy Markdown
Member

/allow

@dscho

dscho commented Nov 18, 2026

Copy link
Copy Markdown
Member

@letmaik please note that Jeff retired and will be unlikely to respond.

@gitgitgadget

gitgitgadget Bot commented Nov 18, 2026

Copy link
Copy Markdown

User letmaik is now allowed to use GitGitGadget.

@letmaik

letmaik commented Nov 18, 2026

Copy link
Copy Markdown
Author

@letmaik please note that Jeff retired and will be unlikely to respond.

I've removed him from CC.

@letmaik

letmaik commented Nov 18, 2026

Copy link
Copy Markdown
Author

/preview

@gitgitgadget

gitgitgadget Bot commented Nov 18, 2026

Copy link
Copy Markdown

Preview email sent as pull.2318.git.1794982384346.gitgitgadget@gmail.com

@letmaik

letmaik commented Nov 18, 2026

Copy link
Copy Markdown
Author

/submit

@gitgitgadget

gitgitgadget Bot commented Nov 18, 2026

Copy link
Copy Markdown

Submitted as pull.2318.git.1795026168007.gitgitgadget@gmail.com

To fetch this version into FETCH_HEAD:

git fetch https://github.com/gitgitgadget/git/ pr-2318/letmaik/diff-lib-fsmonitor-leading-path-v1

To fetch this version to local tag pr-2318/letmaik/diff-lib-fsmonitor-leading-path-v1:

git fetch --no-tags https://github.com/gitgitgadget/git/ tag pr-2318/letmaik/diff-lib-fsmonitor-leading-path-v1

@gitgitgadget

gitgitgadget Bot commented Nov 19, 2026

Copy link
Copy Markdown

Junio C Hamano wrote on the Git mailing list (how to reply to this email):

"Maik Riechert via GitGitGadget" <gitgitgadget@gmail.com> writes:

> diff --git a/diff-lib.c b/diff-lib.c
> index 086476bd77..3730e04149 100644
> --- a/diff-lib.c
> +++ b/diff-lib.c
> @@ -43,10 +43,10 @@ static int check_removed(const struct cache_entry *ce, struct stat *st)
>  {
>  	int stat_err;
>  
> -	if (!(ce->ce_flags & CE_FSMONITOR_VALID))
> -		stat_err = lstat(ce->name, st);
> -	else
> -		stat_err = fake_lstat(ce, st);
> +	if (ce->ce_flags & CE_FSMONITOR_VALID)
> +		return fake_lstat(ce, st);
> +
> +	stat_err = lstat(ce->name, st);
>  	if (stat_err < 0) {
>  		if (!is_missing_file_error(errno))
>  			return -1;

Now that stat_err is used only once, we can retire the variable and
inline the lstat() call inside the if() condition.

Other than that, assuming that the CE_FSMONITOR_VALID bit is
trustworthy, the change looks OK.  has_symlink_leading_path() would
be fairly expensive and being able to avoid it is a big plus, which
is done in other code paths like read-cache.c:refresh_cache_ent()
and preload-index.c:preload_thread() already.

Since 4f3d6d0 (fsmonitor: skip lstat deletion check during git
diff-index, 2021-03-17), check_removed() does not lstat() entries
that fsmonitor says are unchanged. But it still calls
has_symlink_leading_path() for them, which lstat()s the directories
leading up to each path.

That check is there to notice a leading directory that was replaced
by a symlink. fsmonitor would have reported such a change, and
refresh_fsmonitor() would have cleared CE_FSMONITOR_VALID for every
entry below it, so we would not get here. preload_index() already
trusts the flag this way and skips these entries altogether.

The S_ISDIR() check that follows cannot trigger either: the mode
comes from the index, and gitlinks are never marked valid.

So return as soon as fake_lstat() has filled in the stat data.

The first new test checks the shortcut itself by replacing a parent
directory with a symlink without telling fsmonitor. The other two make
sure we still notice when fsmonitor does report that directory, with
and without a trailing slash, since nothing else checks for it now.

On Linux, with 100,000 files (ten per directory), a hook that
reports nothing and a warm cache, "git diff HEAD" goes from 57ms to
26ms.

Signed-off-by: Maik Riechert <letmaik@outlook.com>
@letmaik
letmaik force-pushed the diff-lib-fsmonitor-leading-path branch from 22f99f7 to 4f8cbd8 Compare November 19, 2026 05:39
@letmaik

letmaik commented Nov 19, 2026

Copy link
Copy Markdown
Author

/submit

@gitgitgadget

gitgitgadget Bot commented Nov 19, 2026

Copy link
Copy Markdown

Submitted as pull.2318.v2.git.1795067037014.gitgitgadget@gmail.com

To fetch this version into FETCH_HEAD:

git fetch https://github.com/gitgitgadget/git/ pr-2318/letmaik/diff-lib-fsmonitor-leading-path-v2

To fetch this version to local tag pr-2318/letmaik/diff-lib-fsmonitor-leading-path-v2:

git fetch --no-tags https://github.com/gitgitgadget/git/ tag pr-2318/letmaik/diff-lib-fsmonitor-leading-path-v2

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants