Re: [PATCH 5/5] ls-files: fix bug when recuring with relative pathspec
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Feb 28, 2017, 21:07 UTC
- Message-ID
- <xmqqa896ja7z.fsf@gitster.mtv.corp.google.com>
- In-Reply-To
- <20170224235100.52627-6-bmwill@google.com>
Brandon Williams <bmwill@google.com> writes:
Show 26 quoted lines
> Fix a bug which causes a child process for a submodule to error out when a
> relative pathspec with a ".." is provided in the superproject.
>
> While at it, correctly construct the super-prefix to be used in a submodule
> when not at the root of the repository.
>
> Signed-off-by: Brandon Williams <bmwill@google.com>
> ---
> builtin/ls-files.c | 8 ++++++--
> t/t3007-ls-files-recurse-submodules.sh | 2 +-
> 2 files changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/builtin/ls-files.c b/builtin/ls-files.c
> index 159229081..89533ab8e 100644
> --- a/builtin/ls-files.c
> +++ b/builtin/ls-files.c
> @@ -194,12 +194,15 @@ static void compile_submodule_options(const struct dir_struct *dir, int show_tag
> static void show_gitlink(const struct cache_entry *ce)
> {
> struct child_process cp = CHILD_PROCESS_INIT;
> + struct strbuf name = STRBUF_INIT;
> int status;
> int i;
>
> + quote_path_relative(ce->name, prefix, &name);
> argv_array_pushf(&cp.args, "--super-prefix=%s%s/",Same comment as 3/5. quote_path is to produce c-quote and is not even meant for shell script quoting. run_command() interface would do its own shell quoting when needed, so I think you just want the exact string you want to pass here.