From: Junio C Hamano <gitster@pobox•com>
To: Christian Couder <christian.couder@gmail•com>
Cc: git@vger•kernel.org, "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: Re: [PATCH v4 03/10] update-index: add --test-untracked-cache
Date: Tue, 29 Dec 2015 14:28:23 -0800 [thread overview]
Message-ID: <xmqqy4ccga9k.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <1451372974-16266-4-git-send-email-chriscool@tuxfamily.org> (Christian Couder's message of "Tue, 29 Dec 2015 08:09:27 +0100")
Christian Couder <christian.couder@gmail•com> writes:
> 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 | 12 +++++++++++-
> builtin/update-index.c | 5 +++++
> 2 files changed, 16 insertions(+), 1 deletion(-)
>
> diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt
> index f4e5a85..a0afe17 100644
> --- a/Documentation/git-update-index.txt
> +++ b/Documentation/git-update-index.txt
> @@ -18,7 +18,7 @@ SYNOPSIS
> [--[no-]skip-worktree]
> [--ignore-submodules]
> [--[no-]split-index]
> - [--[no-|force-]untracked-cache]
> + [--[no-|test-|force-]untracked-cache]
> [--really-refresh] [--unresolve] [--again | -g]
> [--info-only] [--index-info]
> [-z] [--stdin] [--index-version <n>]
> @@ -180,6 +180,16 @@ 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. If a test fails
> + the exit code is 1 and a message explains what is not
> + working as needed, otherwise the exit code is 0 and OK is
> + printed.
> +
Looks good.
> --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 1e546a3..62222dd 100644
> --- a/builtin/update-index.c
> +++ b/builtin/update-index.c
> @@ -40,6 +40,7 @@ enum uc_mode {
> UC_UNSPECIFIED = -1,
> UC_DISABLE = 0,
> UC_ENABLE,
> + UC_TEST,
> UC_FORCE
> };
>
> @@ -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"), UC_TEST),
> OPT_SET_INT(0, "force-untracked-cache", &untracked_cache,
> N_("enable untracked cache without testing the filesystem"), UC_FORCE),
> 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 == UC_TEST)
> + return 0;
> }
> if (!the_index.untracked) {
> uc = xcalloc(1, sizeof(*uc));
next prev parent reply other threads:[~2015-12-29 22:28 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-29 7:09 [PATCH v4 00/10] Untracked cache improvements Christian Couder
2015-12-29 7:09 ` [PATCH v4 01/10] dir: free untracked cache when removing it Christian Couder
2015-12-29 22:26 ` Junio C Hamano
2015-12-29 7:09 ` [PATCH v4 02/10] update-index: use enum for untracked cache options Christian Couder
2015-12-29 7:09 ` [PATCH v4 03/10] update-index: add --test-untracked-cache Christian Couder
2015-12-29 22:28 ` Junio C Hamano [this message]
2015-12-29 7:09 ` [PATCH v4 04/10] update-index: add untracked cache notifications Christian Couder
2015-12-29 7:09 ` [PATCH v4 05/10] update-index: move 'uc' var declaration Christian Couder
2015-12-29 7:09 ` [PATCH v4 06/10] dir: add {new,add}_untracked_cache() Christian Couder
2015-12-29 7:09 ` [PATCH v4 07/10] dir: add remove_untracked_cache() Christian Couder
2015-12-29 7:09 ` [PATCH v4 08/10] dir: simplify untracked cache "ident" field Christian Couder
2015-12-29 22:32 ` Junio C Hamano
2015-12-30 22:01 ` Christian Couder
2015-12-30 11:47 ` Torsten Bögershausen
2015-12-30 17:20 ` Christian Couder
2015-12-29 7:09 ` [PATCH v4 09/10] config: add core.untrackedCache Christian Couder
2015-12-29 22:35 ` Junio C Hamano
2015-12-30 22:47 ` Christian Couder
2015-12-30 23:23 ` Junio C Hamano
2015-12-31 12:33 ` Christian Couder
2016-01-04 18:09 ` Junio C Hamano
2016-01-08 17:52 ` Christian Couder
2016-01-08 19:43 ` Junio C Hamano
2015-12-29 7:09 ` [PATCH v4 10/10] 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqy4ccga9k.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=avarab@gmail$(echo .)com \
--cc=chriscool@tuxfamily$(echo .)org \
--cc=christian.couder@gmail$(echo .)com \
--cc=dturner@twopensource$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=pclouds@gmail$(echo .)com \
--cc=peff@peff$(echo .)net \
--cc=sunshine@sunshineco$(echo .)com \
--cc=tboegi@web$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox