From: Brandon Williams <bmwill@google.com>
To: git@vger.kernel.org
Cc: Brandon Williams <bmwill@google.com>,
sbeller@google.com, pclouds@gmail.com
Subject: [PATCH 0/5] recursing submodules with relative pathspec (grep and ls-files)
Date: Fri, 24 Feb 2017 15:50:55 -0800 [thread overview]
Message-ID: <20170224235100.52627-1-bmwill@google.com> (raw)
It was discovered that when using the --recurse-submodules flag with `git grep`
and `git ls-files` and specifying a relative path when not at the root causes
the child processes spawned to error out with an error like:
fatal: ..: '..' is outside repository
While true that ".." is outside the scope of the submodule repository, it
probably doesn't make much sense to the user who gave that pathspec with
respect to the superproject. Since the child processes that are spawned to
handle the submodules have some context that they are executing underneath a
superproject (via the 'super_prefix'), they should be able to prevent dying
under this circumstance.
This series fixes this bug in both git grep and git ls-files as well as
correctly formatting the output from submodules to handle the relative paths
with "..".
One of the changes made to fix this was to add an additional flag for the
parse_pathspec() function in order to treat all paths provided as being from
the root of the repository. I hesitantly selected the name 'PATHSPEC_FROMROOT'
but I'm not fond of it since its too similar to the pathspec magic define
'PATHSPEC_FROMTOP'. So I'm open for naming suggestions.
Brandon Williams (5):
grep: illustrate bug when recursing with relative pathspec
pathspec: add PATHSPEC_FROMROOT flag
grep: fix bug when recuring with relative pathspec
ls-files: illustrate bug when recursing with relative pathspec
ls-files: fix bug when recuring with relative pathspec
builtin/grep.c | 8 ++++--
builtin/ls-files.c | 8 ++++--
pathspec.c | 2 +-
pathspec.h | 2 ++
t/t3007-ls-files-recurse-submodules.sh | 50 ++++++++++++++++++++++++++++++++++
t/t7814-grep-recurse-submodules.sh | 42 ++++++++++++++++++++++++++++
6 files changed, 107 insertions(+), 5 deletions(-)
--
2.11.0.483.g087da7b7c-goog
next reply other threads:[~2017-02-24 23:51 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-24 23:50 Brandon Williams [this message]
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
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=20170224235100.52627-1-bmwill@google.com \
--to=bmwill@google.com \
--cc=git@vger.kernel.org \
--cc=pclouds@gmail.com \
--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).