Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fsmonitor: only enable it in non-bare repositories #3236

Merged
merged 1 commit into from
May 25, 2021
Merged

fsmonitor: only enable it in non-bare repositories #3236

merged 1 commit into from
May 25, 2021

Conversation

dscho
Copy link
Member

@dscho dscho commented May 25, 2021

It does not make sense there, and it would spit out error messages.

@dscho
fsmonitor: only enable it in non-bare repositories
959c1eb 
The entire point of the FSMonitor is to monitor the worktree changes in
a more efficient manner than `lstat()`ing all worktree files every time
we refresh the index.

But if there is no worktree, FSMonitor has nothing to monitor.

So let's ignore if an FSMonitor is configured (e.g. in `~/.gitconfig`)
and we're running in a repository without worktree.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho dscho requested a review from jeffhostetler May 25, 2021 10:19
@dscho dscho added this to the Next release milestone May 25, 2021
@dscho dscho merged commit cc58341 into git-for-windows:main May 25, 2021
@dscho dscho deleted the no-fsmonitor-in-bare-repos branch May 25, 2021 11:37
git-for-windows-ci pushed a commit that referenced this pull request May 25, 2021
@dscho
Merge pull request #3236 from dscho/no-fsmonitor-in-bare-repos
de7122c 
fsmonitor: only enable it in non-bare repositories
git-for-windows-ci pushed a commit that referenced this pull request May 25, 2021
@dscho
Merge pull request #3236 from dscho/no-fsmonitor-in-bare-repos
073fa93 
fsmonitor: only enable it in non-bare repositories
git-for-windows-ci pushed a commit that referenced this pull request May 25, 2021
@dscho
Merge pull request #3236 from dscho/no-fsmonitor-in-bare-repos
11a23f8 
fsmonitor: only enable it in non-bare repositories
git-for-windows-ci pushed a commit that referenced this pull request May 25, 2021
@dscho
Merge pull request #3236 from dscho/no-fsmonitor-in-bare-repos
ff4c8c3 
fsmonitor: only enable it in non-bare repositories
git-for-windows-ci pushed a commit that referenced this pull request May 27, 2021
@dscho
Merge pull request #3236 from dscho/no-fsmonitor-in-bare-repos
659b137 
fsmonitor: only enable it in non-bare repositories
git-for-windows-ci pushed a commit that referenced this pull request May 27, 2021
@dscho
Merge pull request #3236 from dscho/no-fsmonitor-in-bare-repos
37b6c06 
fsmonitor: only enable it in non-bare repositories
git-for-windows-ci pushed a commit that referenced this pull request May 27, 2021
@dscho
Merge pull request #3236 from dscho/no-fsmonitor-in-bare-repos
804a7eb 
fsmonitor: only enable it in non-bare repositories
git-for-windows-ci pushed a commit that referenced this pull request May 28, 2021
@dscho
Merge pull request #3236 from dscho/no-fsmonitor-in-bare-repos
ad2ab94 
fsmonitor: only enable it in non-bare repositories
git-for-windows-ci pushed a commit that referenced this pull request May 28, 2021
@dscho
Merge pull request #3236 from dscho/no-fsmonitor-in-bare-repos
4c8dd48 
fsmonitor: only enable it in non-bare repositories
dscho added a commit to dscho/git that referenced this pull request May 28, 2021
@dscho
Merge pull request git-for-windows#3236 from dscho/no-fsmonitor-in-ba…
271ee96 
…re-repos

fsmonitor: only enable it in non-bare repositories
git-for-windows-ci pushed a commit that referenced this pull request May 28, 2021
@dscho
Merge pull request #3236 from dscho/no-fsmonitor-in-bare-repos
c749f2f 
fsmonitor: only enable it in non-bare repositories
git-for-windows-ci pushed a commit that referenced this pull request May 28, 2021
@dscho
Merge pull request #3236 from dscho/no-fsmonitor-in-bare-repos
c698697 
fsmonitor: only enable it in non-bare repositories
git-for-windows-ci pushed a commit that referenced this pull request May 28, 2021
@dscho
Merge pull request #3236 from dscho/no-fsmonitor-in-bare-repos
f00565c 
fsmonitor: only enable it in non-bare repositories
git-for-windows-ci pushed a commit that referenced this pull request May 28, 2021
@dscho
Merge pull request #3236 from dscho/no-fsmonitor-in-bare-repos
7e30d2b 
fsmonitor: only enable it in non-bare repositories
git-for-windows-ci pushed a commit that referenced this pull request May 31, 2021
@dscho
Merge pull request #3236 from dscho/no-fsmonitor-in-bare-repos
9023fce 
fsmonitor: only enable it in non-bare repositories
git-for-windows-ci pushed a commit that referenced this pull request May 31, 2021
@dscho
Merge pull request #3236 from dscho/no-fsmonitor-in-bare-repos
a8774b9 
fsmonitor: only enable it in non-bare repositories
git-for-windows-ci pushed a commit that referenced this pull request Jun 1, 2021
@dscho
Merge pull request #3236 from dscho/no-fsmonitor-in-bare-repos
2ab0dd8 
fsmonitor: only enable it in non-bare repositories
git-for-windows-ci pushed a commit that referenced this pull request Jun 1, 2021
@dscho
Merge pull request #3236 from dscho/no-fsmonitor-in-bare-repos
a30b5ea 
fsmonitor: only enable it in non-bare repositories
git-for-windows-ci pushed a commit that referenced this pull request Jun 2, 2021
@dscho
Merge pull request #3236 from dscho/no-fsmonitor-in-bare-repos
d2d5be2 
fsmonitor: only enable it in non-bare repositories
git-for-windows-ci pushed a commit that referenced this pull request Jun 2, 2021
@dscho
Merge pull request #3236 from dscho/no-fsmonitor-in-bare-repos
40e0630 
fsmonitor: only enable it in non-bare repositories
git-for-windows-ci pushed a commit that referenced this pull request Jun 2, 2021
@dscho
Merge pull request #3236 from dscho/no-fsmonitor-in-bare-repos
d0bc406 
fsmonitor: only enable it in non-bare repositories
git-for-windows-ci pushed a commit that referenced this pull request Jun 2, 2021
@dscho
Merge pull request #3236 from dscho/no-fsmonitor-in-bare-repos
ad62862 
fsmonitor: only enable it in non-bare repositories
git-for-windows-ci pushed a commit that referenced this pull request Jun 2, 2021
@dscho
Merge pull request #3236 from dscho/no-fsmonitor-in-bare-repos
72f75f9 
fsmonitor: only enable it in non-bare repositories
git-for-windows-ci pushed a commit that referenced this pull request Jun 2, 2021
@dscho
Merge pull request #3236 from dscho/no-fsmonitor-in-bare-repos
54c9790 
fsmonitor: only enable it in non-bare repositories
git-for-windows-ci pushed a commit that referenced this pull request Jul 19, 2021
@dscho
Merge pull request #3236 from dscho/no-fsmonitor-in-bare-repos
1194f19 
fsmonitor: only enable it in non-bare repositories
git-for-windows-ci pushed a commit that referenced this pull request Jul 19, 2021
@dscho
Merge pull request #3236 from dscho/no-fsmonitor-in-bare-repos
929326c 
fsmonitor: only enable it in non-bare repositories
git-for-windows-ci pushed a commit that referenced this pull request Jul 19, 2021
@dscho
Merge pull request #3236 from dscho/no-fsmonitor-in-bare-repos
c0b34c5 
fsmonitor: only enable it in non-bare repositories
git-for-windows-ci pushed a commit that referenced this pull request Jul 19, 2021
@dscho
Merge pull request #3236 from dscho/no-fsmonitor-in-bare-repos
d697348 
fsmonitor: only enable it in non-bare repositories
dscho added a commit that referenced this pull request Jul 19, 2021
@dscho
Merge pull request #3236 from dscho/no-fsmonitor-in-bare-repos
cda1f7d 
fsmonitor: only enable it in non-bare repositories
git-for-windows-ci pushed a commit that referenced this pull request Jul 21, 2021
@dscho
Merge pull request #3236 from dscho/no-fsmonitor-in-bare-repos
95f54a9 
fsmonitor: only enable it in non-bare repositories
git-for-windows-ci pushed a commit that referenced this pull request Jul 22, 2021
@dscho
Merge pull request #3236 from dscho/no-fsmonitor-in-bare-repos
4383022 
fsmonitor: only enable it in non-bare repositories
dscho added a commit that referenced this pull request Jul 23, 2021
@dscho
Merge pull request #3236 from dscho/no-fsmonitor-in-bare-repos
85ae80f 
fsmonitor: only enable it in non-bare repositories
git-for-windows-ci pushed a commit that referenced this pull request Jul 24, 2021
@dscho
Merge pull request #3236 from dscho/no-fsmonitor-in-bare-repos
47f552d 
fsmonitor: only enable it in non-bare repositories
git-for-windows-ci pushed a commit that referenced this pull request Jul 24, 2021
@dscho
Merge pull request #3236 from dscho/no-fsmonitor-in-bare-repos
c9a3824 
fsmonitor: only enable it in non-bare repositories
git-for-windows-ci pushed a commit that referenced this pull request Jul 24, 2021
@dscho
Merge pull request #3236 from dscho/no-fsmonitor-in-bare-repos
fa510f7 
fsmonitor: only enable it in non-bare repositories
git-for-windows-ci pushed a commit that referenced this pull request Jul 26, 2021
@dscho
Merge pull request #3236 from dscho/no-fsmonitor-in-bare-repos
0a42f99 
fsmonitor: only enable it in non-bare repositories
git-for-windows-ci pushed a commit that referenced this pull request Jul 28, 2021
@dscho
Merge pull request #3236 from dscho/no-fsmonitor-in-bare-repos
ed19e97 
fsmonitor: only enable it in non-bare repositories
git-for-windows-ci pushed a commit that referenced this pull request Jul 28, 2021
@dscho
Merge pull request #3236 from dscho/no-fsmonitor-in-bare-repos
3999bb1 
fsmonitor: only enable it in non-bare repositories
git-for-windows-ci pushed a commit that referenced this pull request Jul 29, 2021
@dscho
Merge pull request #3236 from dscho/no-fsmonitor-in-bare-repos
2a2e10e 
fsmonitor: only enable it in non-bare repositories
git-for-windows-ci pushed a commit that referenced this pull request Jul 29, 2021
@dscho
Merge pull request #3236 from dscho/no-fsmonitor-in-bare-repos
d6bbe72 
fsmonitor: only enable it in non-bare repositories
git-for-windows-ci pushed a commit that referenced this pull request Jul 29, 2021
@dscho
Merge pull request #3236 from dscho/no-fsmonitor-in-bare-repos
69dcaef 
fsmonitor: only enable it in non-bare repositories
dscho added a commit that referenced this pull request Aug 2, 2021
@dscho
Merge pull request #3236 from dscho/no-fsmonitor-in-bare-repos
178fd72 
fsmonitor: only enable it in non-bare repositories
git-for-windows-ci pushed a commit that referenced this pull request Aug 2, 2021
@dscho
Merge pull request #3236 from dscho/no-fsmonitor-in-bare-repos
d259551 
fsmonitor: only enable it in non-bare repositories
git-for-windows-ci pushed a commit that referenced this pull request Aug 2, 2021
@dscho
Merge pull request #3236 from dscho/no-fsmonitor-in-bare-repos
69b41f8 
fsmonitor: only enable it in non-bare repositories
git-for-windows-ci pushed a commit that referenced this pull request Aug 2, 2021
@dscho
Merge pull request #3236 from dscho/no-fsmonitor-in-bare-repos
270cbf7 
fsmonitor: only enable it in non-bare repositories
git-for-windows-ci pushed a commit that referenced this pull request Aug 2, 2021
@dscho
Merge pull request #3236 from dscho/no-fsmonitor-in-bare-repos
8ecff56 
fsmonitor: only enable it in non-bare repositories
git-for-windows-ci pushed a commit that referenced this pull request Aug 2, 2021
@dscho
Merge pull request #3236 from dscho/no-fsmonitor-in-bare-repos
4932a23 
fsmonitor: only enable it in non-bare repositories
dscho added a commit to dscho/git that referenced this pull request Aug 3, 2021
@dscho
Merge pull request git-for-windows#3236 from dscho/no-fsmonitor-in-ba…
6912bde 
…re-repos

fsmonitor: only enable it in non-bare repositories
git-for-windows-ci pushed a commit that referenced this pull request Aug 3, 2021
@dscho
Merge pull request #3236 from dscho/no-fsmonitor-in-bare-repos
6fd0b20 
fsmonitor: only enable it in non-bare repositories
dscho added a commit that referenced this pull request Aug 3, 2021
@dscho
Merge pull request #3236 from dscho/no-fsmonitor-in-bare-repos
af354c2 
fsmonitor: only enable it in non-bare repositories
dscho added a commit that referenced this pull request Aug 3, 2021
@dscho
Merge pull request #3236 from dscho/no-fsmonitor-in-bare-repos
533442e 
fsmonitor: only enable it in non-bare repositories
git-for-windows-ci pushed a commit that referenced this pull request Aug 4, 2021
@dscho
Merge pull request #3236 from dscho/no-fsmonitor-in-bare-repos
28a2286 
fsmonitor: only enable it in non-bare repositories
dscho added a commit that referenced this pull request Aug 4, 2021
@dscho
Merge pull request #3236 from dscho/no-fsmonitor-in-bare-repos
9d8d0d5 
fsmonitor: only enable it in non-bare repositories
dscho added a commit to dscho/git that referenced this pull request Aug 5, 2021
@dscho
fixup! Merge pull request git-for-windows#3236 from dscho/no-fsmonito…
d9811c0 
…r-in-bare-repos

In preparation for updating to FSMonitor v4, let's revert this.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@derrickstolee derrickstolee derrickstolee approved these changes

@jeffhostetler jeffhostetler Awaiting requested review from jeffhostetler

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v2.32.0
Development

Successfully merging this pull request may close these issues.
2 participants
@dscho @derrickstolee