From: Brandon Williams <bmwill@google.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Stefan Beller <sbeller@google.com>,
"git@vger.kernel.org" <git@vger.kernel.org>,
Jeff King <peff@peff.net>,
Johannes Schindelin <johannes.schindelin@gmx.de>,
Duy Nguyen <pclouds@gmail.com>
Subject: Re: [PATCH v3 2/5] setup: allow for prefix to be passed to git commands
Date: Mon, 20 Mar 2017 15:34:18 -0700 [thread overview]
Message-ID: <20170320223418.GB188475@google.com> (raw)
In-Reply-To: <xmqqinn761f7.fsf@gitster.mtv.corp.google.com>
On 03/17, Junio C Hamano wrote:
> Brandon Williams <bmwill@google.com> writes:
>
> > I don't think that prefix can ever have ".." in it. From what I
> > understand it is always a path from the root of the repository to the
> > cwd that the git command was invoked by. So in your example prefix
> > would be "src/".
>
> The prefix would be NULL or "", as you will be at the root-level of
> the working tree when you are running _IN_ the submodule (by
> recursing into it). Not src/, nor anything with ../ in it, I would
> think.
Yes, the prefix that is found during setup of a submodule process would
be NULL or "" as the command would be invoked from the root of that
repository. This series would sort of change that though.
If a command was invoked from 'src/' with a pathspec of '../dir/' and
there is a submodule at 'dir/sub', the process working on the submodule
will have the following:
super_prefix = 'dir/sub/'
prefix = 'src/' (Passed from the parent process via the
GIT_INTERNAL_TOPLEVEL_PREFIX env var)
pathspec = '../dir/'
With that information the child process will be able to properly resolve
the pathspec to be 'dir/' (using the prefix) and will be able to match
against it by pre-pending the super_prefix (e.g. dir/sub/some/file, where
some/file is a file in the submodule). It will also be able to generate
correct output relative to the directory the command was originally
invoked from by first pre-pending the super_prefix so we have
'dir/sub/some/file' and then calling relative_path() with the prefix
that was passed in such that the output for this file looks like
'../dir/sub/some/file'
That the gist of how I'm hoping to solve the problem. Hopefully that was
clear enough to get some feedback on.
--
Brandon Williams
next prev parent reply other threads:[~2017-03-20 22:34 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-24 23:50 [PATCH 0/5] recursing submodules with relative pathspec (grep and ls-files) Brandon Williams
2017-02-24 23:50 ` [PATCH 1/5] grep: illustrate bug when recursing with relative pathspec Brandon Williams
2017-02-26 9:53 ` Duy Nguyen
2017-02-27 18:14 ` Brandon Williams
2017-02-24 23:50 ` [PATCH 2/5] pathspec: add PATHSPEC_FROMROOT flag Brandon Williams
2017-02-25 0:31 ` Stefan Beller
2017-02-24 23:50 ` [PATCH 3/5] grep: fix bug when recuring with relative pathspec Brandon Williams
2017-02-28 21:04 ` Junio C Hamano
2017-03-02 18:00 ` Brandon Williams
2017-02-24 23:50 ` [PATCH 4/5] ls-files: illustrate bug when recursing " Brandon Williams
2017-02-24 23:51 ` [PATCH 5/5] ls-files: fix bug when recuring " Brandon Williams
2017-02-28 21:07 ` Junio C Hamano
2017-03-02 18:01 ` Brandon Williams
2017-02-27 17:52 ` [PATCH 0/5] recursing submodules with relative pathspec (grep and ls-files) Brandon Williams
2017-03-06 23:07 ` [RFC PATCH] grep: fix bug when recursing with relative pathspec Brandon Williams
2017-03-14 22:10 ` [PATCH v2 0/4] recursing submodules with relative pathspec (grep and ls-files) Brandon Williams
2017-03-14 22:10 ` [PATCH v2 1/4] grep: fix help text typo Brandon Williams
2017-03-14 22:49 ` Stefan Beller
2017-03-15 0:20 ` Brandon Williams
2017-03-14 22:10 ` [PATCH v2 2/4] setup: allow for prefix to be passed to git commands Brandon Williams
2017-03-14 22:28 ` Johannes Schindelin
2017-03-14 22:35 ` Brandon Williams
2017-03-14 22:10 ` [PATCH v2 3/4] grep: fix bug when recursing with relative pathspec Brandon Williams
2017-03-14 23:03 ` Stefan Beller
2017-03-14 22:11 ` [PATCH v2 4/4] ls-files: " Brandon Williams
2017-03-14 23:06 ` Stefan Beller
2017-03-15 17:02 ` Brandon Williams
2017-03-17 17:22 ` [PATCH v3 0/5] recursing submodules with relative pathspec (grep and ls-files) Brandon Williams
2017-03-17 17:22 ` [PATCH v3 1/5] grep: fix help text typo Brandon Williams
2017-03-17 17:22 ` [PATCH v3 2/5] setup: allow for prefix to be passed to git commands Brandon Williams
2017-03-17 19:07 ` Stefan Beller
2017-03-17 19:08 ` Brandon Williams
2017-03-17 19:10 ` Stefan Beller
2017-03-17 19:17 ` Brandon Williams
2017-03-17 19:17 ` Junio C Hamano
2017-03-17 19:21 ` Brandon Williams
2017-03-17 20:30 ` Junio C Hamano
2017-03-17 21:00 ` Brandon Williams
2017-03-17 21:25 ` Junio C Hamano
2017-03-20 22:34 ` Brandon Williams [this message]
2017-03-21 16:56 ` Junio C Hamano
2017-03-28 23:58 ` Stefan Beller
2017-03-17 17:22 ` [PATCH v3 3/5] grep: fix bug when recursing with relative pathspec Brandon Williams
2017-03-21 11:47 ` Duy Nguyen
2017-03-21 17:56 ` Junio C Hamano
2017-03-22 21:46 ` Brandon Williams
2017-03-17 17:22 ` [PATCH v3 4/5] ls-files: fix typo in variable name Brandon Williams
2017-03-17 17:22 ` [PATCH v3 5/5] ls-files: fix bug when recursing with relative pathspec Brandon Williams
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170320223418.GB188475@google.com \
--to=bmwill@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
--cc=sbeller@google.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).