git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
	"Junio C Hamano" <gitster@pobox.com>
Subject: [PATCH 0/2] Fix racy fsmonitor
Date: Fri, 24 May 2019 05:23:46 -0700 (PDT)	[thread overview]
Message-ID: <pull.223.git.gitgitgadget@gmail.com> (raw)

The t7519-status-fsmonitor.sh tests became a lot more flaky with the recent
fsmonitor fix (js/fsmonitor-refresh-after-discarding-index). That fix,
however, did not introduce the flakiness, but it just made it much more
likely to be hit. And it seemed to be hit only on Windows.

The reason, though, is that the fsmonitor feature failed to mark the
in-memory index as changed, i.e. in need of writing, and it was the 
has_racy_timestamp() test that hid this bug in most cases (although a lot
less on Windows, where the files' mtimes are actually a lot more accurate
than on Linux).

This fixes https://github.com/gitgitgadget/git/issues/197

Johannes Schindelin (2):
  fill_stat_cache_info(): prepare for an fsmonitor fix
  mark_fsmonitor_valid(): mark the index as changed if needed

 apply.c                |  2 +-
 builtin/update-index.c |  2 +-
 cache.h                |  2 +-
 diff-lib.c             |  2 +-
 entry.c                |  2 +-
 fsmonitor.h            |  5 +++--
 preload-index.c        |  2 +-
 read-cache.c           | 10 +++++-----
 8 files changed, 14 insertions(+), 13 deletions(-)


base-commit: aa25c82427ae70aebf3b8f970f2afd54e9a2a8c6
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-223%2Fdscho%2Ffix-racy-fsmonitor-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-223/dscho/fix-racy-fsmonitor-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/223
-- 
gitgitgadget

             reply	other threads:[~2019-05-24 12:23 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-24 12:23 Johannes Schindelin via GitGitGadget [this message]
2019-05-24 12:23 ` [PATCH 1/2] fill_stat_cache_info(): prepare for an fsmonitor fix Johannes Schindelin via GitGitGadget
2019-05-24 12:23 ` [PATCH 2/2] mark_fsmonitor_valid(): mark the index as changed if needed Johannes Schindelin via GitGitGadget

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=pull.223.git.gitgitgadget@gmail.com \
    --to=gitgitgadget@gmail.com \
    --cc=avarab@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --subject='Re: [PATCH 0/2] Fix racy fsmonitor' \
    /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

Code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).