From: Christian Couder <christian.couder@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>, "Jeff King" <peff@peff.net>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Nguyen Thai Ngoc Duy" <pclouds@gmail.com>,
"David Turner" <dturner@twopensource.com>,
"Eric Sunshine" <sunshine@sunshineco.com>,
"Torsten Bögershausen" <tboegi@web.de>,
"Christian Couder" <chriscool@tuxfamily.org>
Subject: [PATCH 3/8] update-index: add --test-untracked-cache
Date: Tue, 8 Dec 2015 18:15:11 +0100 [thread overview]
Message-ID: <1449594916-21167-4-git-send-email-chriscool@tuxfamily.org> (raw)
In-Reply-To: <1449594916-21167-1-git-send-email-chriscool@tuxfamily.org>
It is nice to just be able to test if untracked cache is
supported without enabling it.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
Documentation/git-update-index.txt | 9 ++++++++-
builtin/update-index.c | 5 +++++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt
index 3df9c26..0ff7396 100644
--- a/Documentation/git-update-index.txt
+++ b/Documentation/git-update-index.txt
@@ -17,7 +17,7 @@ SYNOPSIS
[--[no-]assume-unchanged]
[--[no-]skip-worktree]
[--ignore-submodules]
- [--[no-|force-]untracked-cache]
+ [--[no-|test-|force-]untracked-cache]
[--really-refresh] [--unresolve] [--again | -g]
[--info-only] [--index-info]
[-z] [--stdin] [--index-version <n>]
@@ -179,6 +179,13 @@ may not support it yet.
system must change `st_mtime` field of a directory if files
are added or deleted in that directory.
+--test-untracked-cache::
+ Only perform tests on the working directory to make sure
+ untracked cache can be used. You have to manually enable
+ untracked cache using `--force-untracked-cache` (or
+ `--untracked-cache` but this will run the tests again)
+ afterwards if you really want to use it.
+
--force-untracked-cache::
For safety, `--untracked-cache` performs tests on the working
directory to make sure untracked cache can be used. These
diff --git a/builtin/update-index.c b/builtin/update-index.c
index 246b3d3..ecb685d 100644
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -40,6 +40,7 @@ enum uc_mode {
UNDEF_UC = -1,
NO_UC = 0,
UC,
+ TEST_UC,
FORCE_UC
};
@@ -1004,6 +1005,8 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
N_("enable or disable split index")),
OPT_BOOL(0, "untracked-cache", &untracked_cache,
N_("enable/disable untracked cache")),
+ OPT_SET_INT(0, "test-untracked-cache", &untracked_cache,
+ N_("test if the filesystem supports untracked cache"), TEST_UC),
OPT_SET_INT(0, "force-untracked-cache", &untracked_cache,
N_("enable untracked cache without testing the filesystem"), FORCE_UC),
OPT_END()
@@ -1119,6 +1122,8 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
setup_work_tree();
if (!test_if_untracked_cache_is_supported())
return 1;
+ if (untracked_cache == TEST_UC)
+ return 0;
}
if (!the_index.untracked) {
uc = xcalloc(1, sizeof(*uc));
--
2.6.3.478.g9f95483.dirty
next prev parent reply other threads:[~2015-12-08 17:15 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-08 17:15 [PATCH 0/8] Untracked cache improvements Christian Couder
2015-12-08 17:15 ` [PATCH 1/8] update-index: add untracked cache notifications Christian Couder
2015-12-08 19:03 ` Junio C Hamano
2015-12-11 8:51 ` Christian Couder
2015-12-08 17:15 ` [PATCH 2/8] update-index: use enum for untracked cache options Christian Couder
2015-12-08 19:11 ` Junio C Hamano
2015-12-10 10:37 ` Christian Couder
2015-12-10 18:46 ` Junio C Hamano
2015-12-11 9:10 ` Christian Couder
2015-12-11 17:44 ` Junio C Hamano
2015-12-12 9:25 ` Christian Couder
2015-12-08 17:15 ` Christian Couder [this message]
2015-12-08 17:15 ` [PATCH 4/8] update-index: move 'uc' var declaration Christian Couder
2015-12-08 17:15 ` [PATCH 5/8] dir: add add_untracked_cache() Christian Couder
2015-12-09 7:37 ` Torsten Bögershausen
2015-12-11 8:54 ` Christian Couder
2015-12-08 17:15 ` [PATCH 6/8] dir: add remove_untracked_cache() Christian Couder
2015-12-08 19:15 ` Junio C Hamano
2015-12-09 7:39 ` Torsten Bögershausen
2015-12-08 17:15 ` [PATCH 7/8] config: add core.untrackedCache Christian Couder
2015-12-08 19:28 ` Junio C Hamano
2015-12-08 22:43 ` Junio C Hamano
2015-12-14 12:18 ` Christian Couder
2015-12-14 19:44 ` Junio C Hamano
2015-12-14 21:30 ` Junio C Hamano
2015-12-15 9:34 ` Christian Couder
2015-12-15 9:49 ` Torsten Bögershausen
2015-12-15 16:42 ` Christian Couder
2015-12-15 10:02 ` Duy Nguyen
2015-12-15 16:35 ` Christian Couder
2015-12-15 13:04 ` Ævar Arnfjörð Bjarmason
2015-12-15 13:42 ` Christian Couder
2015-12-15 19:40 ` Junio C Hamano
2015-12-15 21:53 ` Ævar Arnfjörð Bjarmason
2015-12-15 23:03 ` Junio C Hamano
2015-12-16 1:10 ` Ævar Arnfjörð Bjarmason
2015-12-16 2:46 ` Jeff King
2015-12-16 5:20 ` Junio C Hamano
2015-12-16 6:05 ` Junio C Hamano
2015-12-17 7:44 ` Jeff King
2015-12-17 12:26 ` Duy Nguyen
[not found] ` <CAP8UFD0S_rWKjWiq_enkN+QVtvnq9fuwAxuuVTXTxu-F1mw4dg@mail.gmail.com>
2015-12-18 22:40 ` Fwd: " Christian Couder
2015-12-21 18:30 ` Junio C Hamano
2015-12-22 8:27 ` Duy Nguyen
2015-12-22 16:33 ` Junio C Hamano
2015-12-24 1:56 ` Junio C Hamano
2015-12-24 9:49 ` Duy Nguyen
2015-12-27 20:21 ` Junio C Hamano
2015-12-24 20:54 ` Christian Couder
[not found] ` <CAP8UFD0LAQG+gQ5EhYYLjo5=tpW3_ah6GV-mgRbgTjjgNmdorA@mail.gmail.com>
2015-12-18 22:38 ` Fwd: " Christian Couder
2015-12-17 12:36 ` Duy Nguyen
2015-12-18 23:24 ` Christian Couder
2015-12-09 13:19 ` Torsten Bögershausen
2015-12-08 17:15 ` [PATCH 8/8] t7063: add tests for core.untrackedCache Christian Couder
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=1449594916-21167-4-git-send-email-chriscool@tuxfamily.org \
--to=christian.couder@gmail.com \
--cc=avarab@gmail.com \
--cc=chriscool@tuxfamily.org \
--cc=dturner@twopensource.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
--cc=sunshine@sunshineco.com \
--cc=tboegi@web.de \
/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).