From: Elijah Newren <newren@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Lessley Dennington <lessleydennington@gmail.com>,
Git Mailing List <git@vger.kernel.org>,
Derrick Stolee <stolee@gmail.com>
Subject: Re: Bug report - sparse-checkout ignores prefix when run in subdirectories
Date: Wed, 5 Jan 2022 15:19:58 -0800 [thread overview]
Message-ID: <CABPp-BH5woi6KY7OBpnsS-M2EmgLHii9zs8rSwrgcPFkOAvn_A@mail.gmail.com> (raw)
In-Reply-To: <xmqqsfu1g64s.fsf@gitster.g>
On Wed, Jan 5, 2022 at 2:38 PM Junio C Hamano <gitster@pobox.com> wrote:
>
> Lessley Dennington <lessleydennington@gmail.com> writes:
>
> > Hello everyone! See the following bug report pertaining to sparse-checkout
> > when run outside top-level directories.
>
> In a bug report it is fine, but "outside top-level" usually means
> above the top-level of the working tree. Here, I think you meant
> running in a subdirectory of the top-level.
>
> Perhaps something along this line?
>
> builtin/sparse-checkout.c | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git c/builtin/sparse-checkout.c w/builtin/sparse-checkout.c
> index 45e838d8f8..4e5efbb85e 100644
> --- c/builtin/sparse-checkout.c
> +++ w/builtin/sparse-checkout.c
> @@ -753,6 +753,16 @@ static int sparse_checkout_set(int argc, const char **argv, const char *prefix)
> if (!core_sparse_checkout_cone && argc == 0) {
> argv = default_patterns;
> argc = default_patterns_nr;
> + } else if (argc && prefix && *prefix) {
> + /*
> + * The args are not pathspecs, so unfortunately we
> + * cannot imitate how cmd_add() uses parse_pathspec().
> + */
> + int i;
> + int prefix_len = strlen(prefix);
> +
> + for (i = 0; i < argc; i++)
> + argv[i] = prefix_path(prefix, prefix_len, argv[i]);
> }
This looks good (sparse_checkout_add() needs a similar fix), at least
for cone mode. There might be a small pickle here that I didn't think
about before. --cone mode always uses directories, so we expect
people to provide directory names. Because of that, I think it's fair
to expect the arguments passed to `set` or `add` to be paths relative
to the current working directory. In contrast, for non-cone mode we
do not expect pathnames but gitignore-style globs. And when we get
gitignore-style globs, we don't know if they were intended relative to
the current working directory or the toplevel, because we only have
one $GIT_DIR/info/sparse-checkout file versus many .gitignore files.
So, should "**.py" go directly into the sparse-checkout file as-is, or
be translated to "my/current/subdir/**.py" first?
Maybe translating is always fine, or maybe we want to throw an error
when: (not using cone mode and prefix is non-empty and any patterns
are provided).
Thoughts?
>
> return modify_pattern_list(argc, argv, set_opts.use_stdin, REPLACE);
next prev parent reply other threads:[~2022-01-05 23:20 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-05 20:13 Bug report - sparse-checkout ignores prefix when run in subdirectories Lessley Dennington
2022-01-05 22:38 ` Junio C Hamano
2022-01-05 23:19 ` Elijah Newren [this message]
2022-01-05 23:29 ` Junio C Hamano
2022-01-06 0:08 ` Elijah Newren
2022-01-06 0:17 ` Junio C Hamano
2022-01-06 1:08 ` Elijah Newren
2022-01-06 19:25 ` Junio C Hamano
2022-01-27 16:43 ` Derrick Stolee
2022-01-27 17:30 ` Elijah Newren
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=CABPp-BH5woi6KY7OBpnsS-M2EmgLHii9zs8rSwrgcPFkOAvn_A@mail.gmail.com \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=lessleydennington@gmail.com \
--cc=stolee@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 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 NNTP newsgroup(s).