[PATCH/RFC 1/2] grep: --full-tree
- From
Michael J Gruber <git@drmicha.warpmail.net>
- Date
- Mar 1, 2011, 09:53 UTC
- Message-ID
- <f179d6fa62001ada34a4236327eda985e09416b1.1298972832.git.git@drmicha.warpmail.net>
- In-Reply-To
- <AANLkTi=xrnxUtkayyW1Merh49N6uHy5p-GMrYe6+p==t@mail.gmail.com>
From: Junio C Hamano <gitster@pobox.com>
While working inside a deep subdirectory, it sometimes is necessary to find a string you see in a file you are working on from the files in the entire project. This is especially true when you are dipping your toe into an unfamiliar project.
By default, "git grep" limits its search space to the current directory and below (i.e. as if "-r ." is specified), and it is rather cumbersome to repeat ../ as many times as necessary. This new option tells "git grep" not to limit the search space to the current directory.
Signed-off-by: Junio C Hamano <gitster@pobox.com> --- builtin/grep.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/builtin/grep.c b/builtin/grep.c index 5afee2f..d005528 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -728,6 +728,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix) { int hit = 0; int cached = 0; + int full_tree = 0; int seen_dashdash = 0; int external_grep_allowed__ignored; const char *show_in_pager = NULL, *default_pager = "dummy"; @@ -773,6 +774,8 @@ int cmd_grep(int argc, const char **argv, const char *prefix) OPT_BIT('H', NULL, &opt.pathname, "show filenames", 1), OPT_NEGBIT(0, "full-name", &opt.relative, "show filenames relative to top directory", 1), + OPT_BIT(0, "full-tree", &full_tree, + "search from the top of the tree", 1), OPT_BOOLEAN('l', "files-with-matches", &opt.name_only, "show only filenames instead of matching lines"), OPT_BOOLEAN(0, "name-only", &opt.name_only, @@ -957,7 +960,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix) if (i < argc) paths = get_pathspec(prefix, argv + i); - else if (prefix) { + else if (prefix && !full_tree) { paths = xcalloc(2, sizeof(const char *)); paths[0] = prefix; paths[1] = NULL;
-- 1.7.4.1.257.gb09fa