From: Derrick Stolee <stolee@gmail.com>
To: "SZEDER Gábor" <szeder.dev@gmail.com>,
"Derrick Stolee via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, newren@gmail.com, jon@jonsimons.org,
Derrick Stolee <dstolee@microsoft.com>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH v5 06/17] sparse-checkout: create 'disable' subcommand
Date: Thu, 21 Nov 2019 08:17:51 -0500 [thread overview]
Message-ID: <bdad792f-4050-691d-cfc1-f57e83d2b240@gmail.com> (raw)
In-Reply-To: <20191119161545.GH23183@szeder.dev>
On 11/19/2019 11:15 AM, SZEDER Gábor wrote:
> On Mon, Oct 21, 2019 at 01:56:15PM +0000, Derrick Stolee via GitGitGadget wrote:
>> From: Derrick Stolee <dstolee@microsoft.com>
>>
>> The instructions for disabling a sparse-checkout to a full
>> working directory are complicated and non-intuitive. Add a
>> subcommand, 'git sparse-checkout disable', to perform those
>> steps for the user.
>>
>> Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
>> ---
>> Documentation/git-sparse-checkout.txt | 27 ++++++++++++---------------
>> builtin/sparse-checkout.c | 26 +++++++++++++++++++++++++-
>> t/t1091-sparse-checkout-builtin.sh | 15 +++++++++++++++
>> 3 files changed, 52 insertions(+), 16 deletions(-)
>>
>> diff --git a/Documentation/git-sparse-checkout.txt b/Documentation/git-sparse-checkout.txt
>> index b933043b3d..f794d4797a 100644
>> --- a/Documentation/git-sparse-checkout.txt
>> +++ b/Documentation/git-sparse-checkout.txt
>> @@ -48,6 +48,10 @@ To avoid interfering with other worktrees, it first enables the
>> working directory to match the new patterns. Enable the
>> core.sparseCheckout config setting if it is not already enabled.
>>
>> +'disable'::
>> + Remove the sparse-checkout file, set `core.sparseCheckout` to
>> + `false`, and restore the working directory to include all files.
>
> I think it would make sense to leave the sparse-checkout file behind
> as-is, and only update the coonfiguration and the working tree. That
> way users could quickly go back to their last sparse checkout setup by
> simply running 'git sparse-checkout init'.
>
>
>> +static int sparse_checkout_disable(int argc, const char **argv)
>> +{
>> + char *sparse_filename;
>> + FILE *fp;
>> +
>> + if (sc_set_config(MODE_ALL_PATTERNS))
>> + die(_("failed to change config"));
>> +
>> + sparse_filename = get_sparse_checkout_filename();
>> + fp = xfopen(sparse_filename, "w");
>> + fprintf(fp, "/*\n");
>> + fclose(fp);
>> +
>> + if (update_working_directory())
>> + die(_("error while refreshing working directory"));
>> +
>> + unlink(sparse_filename);
>> + free(sparse_filename);
>> +
>> + return sc_set_config(MODE_NO_PATTERNS);
>
> Hrm. So disabling the sparse-checkout calls the same helper function
> to write the configuration as initializing or setting, but with a
> different parameter. However, the error message in that function is:
>
> error(_("failed to enable core.sparseCheckout"));
>
> So if something goes wrong while disabling the sparse-checkout, the
> user might get an error saying "error: failed to enable
> core.sparseCheckout". That doesn't look quite right, does it?
Both of your comments are valid, but will be easier to implement
later in the series, after "sparse-checkout: update working directory
in-process" which previously did not interact with the "disable"
command. I'll add a new commit that adds that integration point
and should resolve your concerns raised here.
-Stolee
next prev parent reply other threads:[~2019-11-21 13:17 UTC|newest]
Thread overview: 196+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-20 15:11 [PATCH 0/9] [RFC] New sparse-checkout builtin and "cone" mode Derrick Stolee via GitGitGadget
2019-08-20 15:11 ` [PATCH 1/9] sparse-checkout: create builtin with 'list' subcommand Derrick Stolee via GitGitGadget
2019-08-23 22:30 ` Elijah Newren
2019-08-20 15:11 ` [PATCH 2/9] sparse-checkout: create 'init' subcommand Derrick Stolee via GitGitGadget
2019-08-23 23:02 ` Elijah Newren
2019-09-11 14:27 ` Derrick Stolee
2019-09-11 20:28 ` Derrick Stolee
2019-08-20 15:11 ` [PATCH 3/9] clone: add --sparse mode Derrick Stolee via GitGitGadget
2019-08-23 23:17 ` Elijah Newren
2019-09-18 13:51 ` Derrick Stolee
2019-08-20 15:11 ` [PATCH 4/9] sparse-checkout: 'add' subcommand Derrick Stolee via GitGitGadget
2019-08-23 23:30 ` Elijah Newren
2019-09-18 13:55 ` Derrick Stolee
2019-09-18 14:56 ` Elijah Newren
2019-09-18 17:23 ` Derrick Stolee
2019-08-20 15:11 ` [PATCH 5/9] sparse-checkout: create 'disable' subcommand Derrick Stolee via GitGitGadget
2019-08-23 23:50 ` Elijah Newren
2019-08-20 15:11 ` [PATCH 6/9] trace2:experiment: clear_ce_flags_1 Jeff Hostetler via GitGitGadget
2019-08-24 0:08 ` Elijah Newren
2019-08-20 15:11 ` [PATCH 7/9] sparse-checkout: add 'cone' mode Derrick Stolee via GitGitGadget
2019-08-24 0:31 ` Elijah Newren
2019-08-20 15:11 ` [PATCH 8/9] sparse-checkout: use hashmaps for cone patterns Derrick Stolee via GitGitGadget
2019-08-24 4:56 ` Elijah Newren
2019-08-20 15:11 ` [PATCH 9/9] sparse-checkout: init and add in cone mode Derrick Stolee via GitGitGadget
2019-08-24 5:07 ` Elijah Newren
2019-08-21 21:52 ` [PATCH 0/9] [RFC] New sparse-checkout builtin and "cone" mode Elijah Newren
2019-08-22 13:10 ` Derrick Stolee
2019-08-22 14:25 ` Derrick Stolee
2019-08-24 5:40 ` Elijah Newren
2019-08-26 13:29 ` Derrick Stolee
2019-08-26 18:16 ` Elijah Newren
2019-08-26 19:16 ` Derrick Stolee
2019-09-02 17:55 ` Eric Sunshine
2019-09-19 14:43 ` [PATCH v2 00/11] " Derrick Stolee via GitGitGadget
2019-09-19 14:43 ` [PATCH v2 01/11] sparse-checkout: create builtin with 'list' subcommand Derrick Stolee via GitGitGadget
2019-10-05 19:22 ` Elijah Newren
2019-09-19 14:43 ` [PATCH v2 02/11] sparse-checkout: create 'init' subcommand Derrick Stolee via GitGitGadget
2019-10-05 19:34 ` Elijah Newren
2019-09-19 14:43 ` [PATCH v2 03/11] clone: add --sparse mode Derrick Stolee via GitGitGadget
2019-10-05 19:40 ` Elijah Newren
2019-10-07 13:56 ` Derrick Stolee
2019-09-19 14:43 ` [PATCH v2 05/11] sparse-checkout: add '--stdin' option to set subcommand Derrick Stolee via GitGitGadget
2019-09-19 14:43 ` [PATCH v2 04/11] sparse-checkout: 'set' subcommand Derrick Stolee via GitGitGadget
2019-10-05 22:44 ` Elijah Newren
2019-10-06 0:30 ` Elijah Newren
2019-10-07 18:26 ` Derrick Stolee
2019-10-11 22:24 ` Elijah Newren
2019-09-19 14:43 ` [PATCH v2 06/11] sparse-checkout: create 'disable' subcommand Derrick Stolee via GitGitGadget
2019-10-06 4:10 ` Elijah Newren
2019-10-07 19:12 ` Derrick Stolee
2019-09-19 14:43 ` [PATCH v2 07/11] trace2: add region in clear_ce_flags Jeff Hostetler via GitGitGadget
2019-10-06 4:13 ` Elijah Newren
2019-09-19 14:43 ` [PATCH v2 08/11] sparse-checkout: add 'cone' mode Derrick Stolee via GitGitGadget
2019-10-06 4:22 ` Elijah Newren
2019-10-07 19:15 ` Derrick Stolee
2019-09-19 14:43 ` [PATCH v2 09/11] sparse-checkout: use hashmaps for cone patterns Derrick Stolee via GitGitGadget
2019-09-19 20:59 ` Derrick Stolee
2019-09-20 14:37 ` Derrick Stolee
2019-09-19 14:43 ` [PATCH v2 10/11] sparse-checkout: init and set in cone mode Derrick Stolee via GitGitGadget
2019-09-19 14:43 ` [PATCH v2 11/11] unpack-trees: hash less " Derrick Stolee via GitGitGadget
2019-10-01 13:40 ` [PATCH v2 00/11] New sparse-checkout builtin and "cone" mode Derrick Stolee
2019-10-01 16:54 ` Elijah Newren
2019-10-01 18:15 ` Derrick Stolee
2019-10-03 22:28 ` Junio C Hamano
2019-10-07 20:08 ` [PATCH v3 00/17] " Derrick Stolee via GitGitGadget
2019-10-07 20:08 ` [PATCH v3 01/17] sparse-checkout: create builtin with 'list' subcommand Derrick Stolee via GitGitGadget
2019-10-11 22:01 ` Elijah Newren
2019-10-07 20:08 ` [PATCH v3 02/17] sparse-checkout: create 'init' subcommand Derrick Stolee via GitGitGadget
2019-10-11 22:14 ` Elijah Newren
2019-10-14 20:22 ` Derrick Stolee
2019-10-07 20:08 ` [PATCH v3 03/17] clone: add --sparse mode Derrick Stolee via GitGitGadget
2019-10-11 22:20 ` Elijah Newren
2019-10-07 20:08 ` [PATCH v3 04/17] sparse-checkout: 'set' subcommand Derrick Stolee via GitGitGadget
2019-10-11 22:26 ` Elijah Newren
2019-10-11 22:30 ` Elijah Newren
2019-10-07 20:08 ` [PATCH v3 05/17] sparse-checkout: add '--stdin' option to set subcommand Derrick Stolee via GitGitGadget
2019-10-11 22:27 ` Elijah Newren
2019-10-14 20:28 ` Derrick Stolee
2019-10-07 20:08 ` [PATCH v3 06/17] sparse-checkout: create 'disable' subcommand Derrick Stolee via GitGitGadget
2019-10-07 20:08 ` [PATCH v3 07/17] trace2: add region in clear_ce_flags Jeff Hostetler via GitGitGadget
2019-10-07 20:08 ` [PATCH v3 08/17] sparse-checkout: add 'cone' mode Derrick Stolee via GitGitGadget
2019-10-07 20:08 ` [PATCH v3 09/17] sparse-checkout: use hashmaps for cone patterns Derrick Stolee via GitGitGadget
2019-10-07 20:08 ` [PATCH v3 10/17] sparse-checkout: init and set in cone mode Derrick Stolee via GitGitGadget
2019-10-07 20:08 ` [PATCH v3 11/17] unpack-trees: hash less " Derrick Stolee via GitGitGadget
2019-10-07 20:08 ` [PATCH v3 12/17] unpack-trees: add progress to clear_ce_flags() Derrick Stolee via GitGitGadget
2019-10-07 20:08 ` [PATCH v3 13/17] read-tree: show progress by default Derrick Stolee via GitGitGadget
2019-10-12 22:16 ` Elijah Newren
2019-10-14 20:31 ` Derrick Stolee
2019-10-07 20:08 ` [PATCH v3 14/17] sparse-checkout: sanitize for nested folders Derrick Stolee via GitGitGadget
2019-10-07 20:08 ` [PATCH v3 15/17] sparse-checkout: update working directory in-process Derrick Stolee via GitGitGadget
2019-10-12 22:57 ` Elijah Newren
2019-10-14 20:39 ` Derrick Stolee
2019-10-07 20:08 ` [PATCH v3 16/17] sparse-checkout: write using lockfile Derrick Stolee via GitGitGadget
2019-10-12 22:59 ` Elijah Newren
2019-10-14 20:41 ` Derrick Stolee
2019-10-07 20:08 ` [PATCH v3 17/17] sparse-checkout: cone mode should not interact with .gitignore Derrick Stolee via GitGitGadget
2019-10-12 23:00 ` Elijah Newren
2019-10-12 23:22 ` [PATCH v3 00/17] New sparse-checkout builtin and "cone" mode Elijah Newren
2019-10-15 13:55 ` [PATCH v4 " Derrick Stolee via GitGitGadget
2019-10-15 13:55 ` [PATCH v4 01/17] sparse-checkout: create builtin with 'list' subcommand Derrick Stolee via GitGitGadget
2019-10-16 19:00 ` Elijah Newren
2019-10-21 12:10 ` Derrick Stolee
2019-10-18 16:07 ` SZEDER Gábor
2019-10-21 11:42 ` Derrick Stolee
2019-10-15 13:55 ` [PATCH v4 02/17] sparse-checkout: create 'init' subcommand Derrick Stolee via GitGitGadget
2019-10-15 13:55 ` [PATCH v4 03/17] clone: add --sparse mode Derrick Stolee via GitGitGadget
2019-10-15 13:55 ` [PATCH v4 04/17] sparse-checkout: 'set' subcommand Derrick Stolee via GitGitGadget
2019-10-15 13:55 ` [PATCH v4 05/17] sparse-checkout: add '--stdin' option to set subcommand Derrick Stolee via GitGitGadget
2019-10-15 13:55 ` [PATCH v4 06/17] sparse-checkout: create 'disable' subcommand Derrick Stolee via GitGitGadget
2019-10-18 16:31 ` SZEDER Gábor
2019-10-15 13:55 ` [PATCH v4 07/17] trace2: add region in clear_ce_flags Jeff Hostetler via GitGitGadget
2019-10-15 13:55 ` [PATCH v4 08/17] sparse-checkout: add 'cone' mode Derrick Stolee via GitGitGadget
2019-10-15 13:55 ` [PATCH v4 09/17] sparse-checkout: use hashmaps for cone patterns Derrick Stolee via GitGitGadget
2019-10-18 15:31 ` SZEDER Gábor
2019-10-21 11:44 ` Derrick Stolee
2019-10-15 13:55 ` [PATCH v4 10/17] sparse-checkout: init and set in cone mode Derrick Stolee via GitGitGadget
2019-10-15 13:55 ` [PATCH v4 11/17] unpack-trees: hash less " Derrick Stolee via GitGitGadget
2019-10-15 13:55 ` [PATCH v4 12/17] unpack-trees: add progress to clear_ce_flags() Derrick Stolee via GitGitGadget
2019-10-15 13:56 ` [PATCH v4 13/17] read-tree: show progress by default Derrick Stolee via GitGitGadget
2019-10-15 13:56 ` [PATCH v4 14/17] sparse-checkout: sanitize for nested folders Derrick Stolee via GitGitGadget
2019-10-15 13:56 ` [PATCH v4 15/17] sparse-checkout: update working directory in-process Derrick Stolee via GitGitGadget
2019-10-18 20:24 ` SZEDER Gábor
2019-10-18 20:40 ` SZEDER Gábor
2019-10-21 11:59 ` Derrick Stolee
2019-10-15 13:56 ` [PATCH v4 16/17] sparse-checkout: write using lockfile Derrick Stolee via GitGitGadget
2019-10-15 13:56 ` [PATCH v4 17/17] sparse-checkout: cone mode should not interact with .gitignore Derrick Stolee via GitGitGadget
2019-10-16 20:07 ` [PATCH v4 00/17] New sparse-checkout builtin and "cone" mode Elijah Newren
2019-10-17 23:53 ` Jon Simons
2019-10-21 12:08 ` Derrick Stolee
2019-10-21 13:56 ` [PATCH v5 " Derrick Stolee via GitGitGadget
2019-10-21 13:56 ` [PATCH v5 01/17] sparse-checkout: create builtin with 'list' subcommand Derrick Stolee via GitGitGadget
2019-11-19 22:51 ` SZEDER Gábor
2019-10-21 13:56 ` [PATCH v5 02/17] sparse-checkout: create 'init' subcommand Derrick Stolee via GitGitGadget
2019-11-19 14:33 ` SZEDER Gábor
2019-11-20 14:13 ` SZEDER Gábor
2019-11-21 11:49 ` SZEDER Gábor
2019-11-21 12:34 ` SZEDER Gábor
2019-11-21 14:28 ` Derrick Stolee
2019-11-21 15:27 ` SZEDER Gábor
2019-11-21 15:36 ` Derrick Stolee
2019-11-21 16:37 ` SZEDER Gábor
2019-11-21 17:01 ` Elijah Newren
2019-11-21 17:15 ` Derrick Stolee
2019-10-21 13:56 ` [PATCH v5 03/17] clone: add --sparse mode Derrick Stolee via GitGitGadget
2019-10-21 13:56 ` [PATCH v5 04/17] sparse-checkout: 'set' subcommand Derrick Stolee via GitGitGadget
2019-11-19 15:46 ` SZEDER Gábor
2019-11-21 13:04 ` Derrick Stolee
2019-11-21 13:36 ` SZEDER Gábor
2019-10-21 13:56 ` [PATCH v5 05/17] sparse-checkout: add '--stdin' option to set subcommand Derrick Stolee via GitGitGadget
2019-11-21 11:21 ` SZEDER Gábor
2019-11-21 13:15 ` Derrick Stolee
2019-10-21 13:56 ` [PATCH v5 06/17] sparse-checkout: create 'disable' subcommand Derrick Stolee via GitGitGadget
2019-11-19 16:15 ` SZEDER Gábor
2019-11-21 13:17 ` Derrick Stolee [this message]
2019-10-21 13:56 ` [PATCH v5 07/17] trace2: add region in clear_ce_flags Jeff Hostetler via GitGitGadget
2019-10-21 13:56 ` [PATCH v5 08/17] sparse-checkout: add 'cone' mode Derrick Stolee via GitGitGadget
2019-11-19 17:36 ` SZEDER Gábor
2019-10-21 13:56 ` [PATCH v5 09/17] sparse-checkout: use hashmaps for cone patterns Derrick Stolee via GitGitGadget
2019-10-21 13:56 ` [PATCH v5 10/17] sparse-checkout: init and set in cone mode Derrick Stolee via GitGitGadget
2019-11-19 17:50 ` SZEDER Gábor
2019-11-21 13:45 ` Derrick Stolee
2019-10-21 13:56 ` [PATCH v5 11/17] unpack-trees: hash less " Derrick Stolee via GitGitGadget
2019-10-21 13:56 ` [PATCH v5 12/17] unpack-trees: add progress to clear_ce_flags() Derrick Stolee via GitGitGadget
2019-10-21 13:56 ` [PATCH v5 13/17] read-tree: show progress by default Derrick Stolee via GitGitGadget
2019-10-21 15:04 ` Phillip Wood
2019-10-21 15:14 ` Derrick Stolee
2019-10-23 3:48 ` Junio C Hamano
2019-10-23 12:50 ` Derrick Stolee
2019-10-24 10:18 ` Phillip Wood
2019-10-24 10:18 ` Phillip Wood
2019-10-21 13:56 ` [PATCH v5 14/17] sparse-checkout: sanitize for nested folders Derrick Stolee via GitGitGadget
2019-10-21 13:56 ` [PATCH v5 15/17] sparse-checkout: update working directory in-process Derrick Stolee via GitGitGadget
2019-11-19 17:07 ` SZEDER Gábor
2019-10-21 13:56 ` [PATCH v5 16/17] sparse-checkout: write using lockfile Derrick Stolee via GitGitGadget
2019-10-21 13:56 ` [PATCH v5 17/17] sparse-checkout: cone mode should not interact with .gitignore Derrick Stolee via GitGitGadget
2019-10-23 3:52 ` [PATCH v5 00/17] New sparse-checkout builtin and "cone" mode Junio C Hamano
2019-11-21 22:04 ` [PATCH v6 00/19] " Derrick Stolee via GitGitGadget
2019-11-21 22:04 ` [PATCH v6 01/19] sparse-checkout: create builtin with 'list' subcommand Derrick Stolee via GitGitGadget
2019-11-21 22:04 ` [PATCH v6 02/19] sparse-checkout: create 'init' subcommand Derrick Stolee via GitGitGadget
2019-11-21 22:04 ` [PATCH v6 03/19] clone: add --sparse mode Derrick Stolee via GitGitGadget
2019-11-21 22:04 ` [PATCH v6 04/19] sparse-checkout: 'set' subcommand Derrick Stolee via GitGitGadget
2019-11-21 22:04 ` [PATCH v6 05/19] sparse-checkout: add '--stdin' option to set subcommand Derrick Stolee via GitGitGadget
2019-11-21 22:04 ` [PATCH v6 06/19] sparse-checkout: create 'disable' subcommand Derrick Stolee via GitGitGadget
2019-11-21 22:04 ` [PATCH v6 07/19] trace2: add region in clear_ce_flags Jeff Hostetler via GitGitGadget
2019-11-21 22:04 ` [PATCH v6 08/19] sparse-checkout: add 'cone' mode Derrick Stolee via GitGitGadget
2019-11-21 22:04 ` [PATCH v6 09/19] sparse-checkout: use hashmaps for cone patterns Derrick Stolee via GitGitGadget
2019-11-21 22:04 ` [PATCH v6 10/19] sparse-checkout: init and set in cone mode Derrick Stolee via GitGitGadget
2019-11-21 22:04 ` [PATCH v6 11/19] unpack-trees: hash less " Derrick Stolee via GitGitGadget
2019-11-21 22:04 ` [PATCH v6 12/19] unpack-trees: add progress to clear_ce_flags() Derrick Stolee via GitGitGadget
2019-11-21 22:04 ` [PATCH v6 13/19] sparse-checkout: sanitize for nested folders Derrick Stolee via GitGitGadget
2019-11-21 22:04 ` [PATCH v6 14/19] sparse-checkout: update working directory in-process Derrick Stolee via GitGitGadget
2019-11-21 22:04 ` [PATCH v6 15/19] sparse-checkout: use in-process update for disable subcommand Derrick Stolee via GitGitGadget
2019-11-21 22:04 ` [PATCH v6 16/19] sparse-checkout: write using lockfile Derrick Stolee via GitGitGadget
2019-11-21 22:04 ` [PATCH v6 17/19] sparse-checkout: cone mode should not interact with .gitignore Derrick Stolee via GitGitGadget
2019-11-21 22:04 ` [PATCH v6 18/19] sparse-checkout: update working directory in-process for 'init' Derrick Stolee via GitGitGadget
2019-11-21 22:04 ` [PATCH v6 19/19] sparse-checkout: check for dirty status Derrick Stolee 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=bdad792f-4050-691d-cfc1-f57e83d2b240@gmail.com \
--to=stolee@gmail.com \
--cc=dstolee@microsoft.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=jon@jonsimons.org \
--cc=newren@gmail.com \
--cc=szeder.dev@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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.