From: Alex Vandiver <alexmv@dropbox.com>
To: git@vger.kernel.org
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Ben Peart <peartben@gmail.com>
Subject: [PATCH 3/6] fsmonitor: Update helper tool, now that flags are filled later
Date: Tue, 2 Jan 2018 19:04:53 -0800 [thread overview]
Message-ID: <fb10a998d5a8250f26d3504a1d1f5ca6723160d7.1514948078.git.alexmv@dropbox.com> (raw)
In-Reply-To: <20180103030456.8181-1-alexmv@dropbox.com>
In-Reply-To: <023b0090bc7dc0ff9c3bee1efce8c85fdba27de3.1514948078.git.alexmv@dropbox.com>
dd9005a0a ("fsmonitor: delay updating state until after split index is
merged", 2017-10-27) began deferring the setting of the
CE_FSMONITOR_VALID flag until later, such that do_read_index() does
not perform those steps. This means that t/helper/test-dump-fsmonitor
showed all bits as always unset.
Load the index using read_index_from(), which is aware of split
indexes and later fsmonitor ewah inflation, but ensure that we do not
add or remove it, by setting the value to "keep".
Signed-off-by: Alex Vandiver <alexmv@dropbox.com>
---
config.c | 9 +++++++--
t/helper/test-dump-fsmonitor.c | 4 +++-
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/config.c b/config.c
index e617c2018..7c6ed888e 100644
--- a/config.c
+++ b/config.c
@@ -2174,8 +2174,13 @@ int git_config_get_fsmonitor(void)
if (core_fsmonitor && !*core_fsmonitor)
core_fsmonitor = NULL;
- if (core_fsmonitor)
- return 1;
+
+ if (core_fsmonitor) {
+ if (!strcasecmp(core_fsmonitor, "keep"))
+ return -1;
+ else
+ return 1;
+ }
return 0;
}
diff --git a/t/helper/test-dump-fsmonitor.c b/t/helper/test-dump-fsmonitor.c
index ad452707e..48c4bab0b 100644
--- a/t/helper/test-dump-fsmonitor.c
+++ b/t/helper/test-dump-fsmonitor.c
@@ -1,12 +1,14 @@
#include "cache.h"
+#include "config.h"
int cmd_main(int ac, const char **av)
{
struct index_state *istate = &the_index;
int i;
+ git_config_push_parameter("core.fsmonitor=keep");
setup_git_directory();
- if (do_read_index(istate, get_index_file(), 0) < 0)
+ if (read_index_from(istate, get_index_file()) < 0)
die("unable to read index file");
if (!istate->fsmonitor_last_update) {
printf("no fsmonitor\n");
--
2.15.1.31.gddce0adfe
next prev parent reply other threads:[~2018-01-03 3:05 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-03 3:04 [PATCH v2 0/6] Minor fsmonitor bugfixes, use with `git diff` Alex Vandiver
2018-01-03 3:04 ` [PATCH 1/6] Fix comments to agree with argument name Alex Vandiver
2018-01-03 3:04 ` [PATCH 2/6] fsmonitor: Stop inline'ing mark_fsmonitor_valid / _invalid Alex Vandiver
2018-01-04 22:27 ` Johannes Schindelin
2018-01-08 20:27 ` Ben Peart
2018-01-03 3:04 ` Alex Vandiver [this message]
2018-01-04 23:03 ` [PATCH 3/6] fsmonitor: Update helper tool, now that flags are filled later Johannes Schindelin
2018-01-03 3:04 ` [PATCH 4/6] fsmonitor: Make output of test-dump-fsmonitor more concise Alex Vandiver
2018-01-04 22:33 ` Johannes Schindelin
2018-01-08 20:33 ` Ben Peart
2018-01-03 3:04 ` [PATCH 5/6] fsmonitor: Remove debugging lines from t/t7519-status-fsmonitor.sh Alex Vandiver
2018-01-03 3:04 ` [PATCH 6/6] fsmonitor: Use fsmonitor data in `git diff` Alex Vandiver
2018-01-04 22:46 ` Johannes Schindelin
2018-01-05 22:22 ` Junio C Hamano
2018-01-08 20:58 ` Ben Peart
-- strict thread matches above, loose matches on Subject: below --
2017-12-19 0:28 [PATCH 0/6] Minor fsmonitor bugfixes, use with " Alex Vandiver
2017-12-19 0:28 ` [PATCH 1/6] Fix comments to agree with argument name Alex Vandiver
2017-12-19 0:28 ` [PATCH 3/6] fsmonitor: Update helper tool, now that flags are filled later Alex Vandiver
2017-12-20 21:12 ` Alex Vandiver
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=fb10a998d5a8250f26d3504a1d1f5ca6723160d7.1514948078.git.alexmv@dropbox.com \
--to=alexmv@dropbox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=peartben@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.
Code repositories for project(s) associated with this public 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).