On Mon, Oct 7, 2019 at 1:08 PM Derrick Stolee via GitGitGadget
<[email protected]> wrote:
>
> From: Derrick Stolee <[email protected]>
>
> The 'git sparse-checkout set' subcommand takes a list of patterns
> and places them in the sparse-checkout file. Then, it updates the
> working directory to match those patterns. For a large list of
> patterns, the command-line call can get very cumbersome.
>
> Add a '--stdin' option to instead read patterns over standard in.
>
> Signed-off-by: Derrick Stolee <[email protected]>
> ---
> builtin/sparse-checkout.c | 40 ++++++++++++++++++++++++++++--
> t/t1091-sparse-checkout-builtin.sh | 27 ++++++++++++++++++++
> 2 files changed, 65 insertions(+), 2 deletions(-)
>
> diff --git a/builtin/sparse-checkout.c b/builtin/sparse-checkout.c
> index 52d4f832f3..68f3d8433e 100644
> --- a/builtin/sparse-checkout.c
> +++ b/builtin/sparse-checkout.c
> @@ -145,6 +145,11 @@ static int write_patterns_and_update(struct pattern_list
> *pl)
> char *sparse_filename;
> FILE *fp;
>
> + if (!core_apply_sparse_checkout) {
> + warning(_("core.sparseCheckout is disabled, so changes to the
> sparse-checkout file will have no effect"));
> + warning(_("run 'git sparse-checkout init' to enable the
> sparse-checkout feature"));
> + }
> +
> sparse_filename = get_sparse_checkout_filename();
> fp = fopen(sparse_filename, "w");
> write_patterns_to_file(fp, pl);
> @@ -154,16 +159,47 @@ static int write_patterns_and_update(struct
> pattern_list *pl)
> return update_working_directory();
> }
>
> +static char const * const builtin_sparse_checkout_set_usage[] = {
> + N_("git sparse-checkout set [--stdin|<patterns>]"),
> + NULL
> +};
> +
> +static struct sparse_checkout_set_opts {
> + int use_stdin;
> +} set_opts;
> +
> static int sparse_checkout_set(int argc, const char **argv, const char
> *prefix)
> {
> static const char *empty_base = "";
> int i;
> struct pattern_list pl;
> int result;
> +
> + static struct option builtin_sparse_checkout_set_options[] = {
> + OPT_BOOL(0, "stdin", &set_opts.use_stdin,
> + N_("read patterns from standard in")),
> + OPT_END(),
> + };
> +
> memset(&pl, 0, sizeof(pl));
>
> - for (i = 1; i < argc; i++)
> - add_pattern(argv[i], empty_base, 0, &pl, 0);
> + argc = parse_options(argc, argv, prefix,
> + builtin_sparse_checkout_set_options,
> + builtin_sparse_checkout_set_usage,
> + PARSE_OPT_KEEP_UNKNOWN);
Does this mean users can also spell it 'git sparse-checkout --stdin
set', instead of the expected 'git sparse-checkout set --stdin'?
> +
> + if (set_opts.use_stdin) {
> + struct strbuf line = STRBUF_INIT;
> +
> + while (!strbuf_getline(&line, stdin)) {
> + size_t len;
> + char *buf = strbuf_detach(&line, &len);
> + add_pattern(buf, empty_base, 0, &pl, 0);
> + }
> + } else {
> + for (i = 0; i < argc; i++)
> + add_pattern(argv[i], empty_base, 0, &pl, 0);
> + }
>
> result = write_patterns_and_update(&pl);
>
> diff --git a/t/t1091-sparse-checkout-builtin.sh
> b/t/t1091-sparse-checkout-builtin.sh
> index 19e8673c6b..2a0137fde3 100755
> --- a/t/t1091-sparse-checkout-builtin.sh
> +++ b/t/t1091-sparse-checkout-builtin.sh
> @@ -101,6 +101,13 @@ test_expect_success 'clone --sparse' '
> test_cmp expect dir
> '
>
> +test_expect_success 'warn if core.sparseCheckout is disabled' '
> + test_when_finished git -C repo config --worktree core.sparseCheckout
> true &&
> + git -C repo config --worktree core.sparseCheckout false &&
> + git -C repo sparse-checkout set folder1 2>err &&
> + test_i18ngrep "core.sparseCheckout is disabled" err
> +'
> +
> test_expect_success 'set sparse-checkout using builtin' '
> git -C repo sparse-checkout set "/*" "!/*/" "*folder*" &&
> cat >expect <<-EOF &&
> @@ -120,4 +127,24 @@ test_expect_success 'set sparse-checkout using builtin' '
> test_cmp expect dir
> '
>
> +test_expect_success 'set sparse-checkout using --stdin' '
> + cat >expect <<-EOF &&
> + /*
> + !/*/
> + /folder1/
> + /folder2/
> + EOF
> + git -C repo sparse-checkout set --stdin <expect &&
> + git -C repo sparse-checkout list >actual &&
> + test_cmp expect actual &&
> + test_cmp expect repo/.git/info/sparse-checkout &&
> + ls repo >dir &&
> + cat >expect <<-EOF &&
> + a
> + folder1
> + folder2
> + EOF
> + test_cmp expect dir
> +'
> +
> test_done
> --
> gitgitgadget
>
