mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'jc/grep-untracked-exclude'
* jc/grep-untracked-exclude: grep: teach --untracked and --exclude-standard options
This commit is contained in:
commit
ab1e76b88c
|
@ -23,7 +23,7 @@ SYNOPSIS
|
|||
[-A <post-context>] [-B <pre-context>] [-C <context>]
|
||||
[-f <file>] [-e] <pattern>
|
||||
[--and|--or|--not|(|)|-e <pattern>...]
|
||||
[--cached | --no-index | <tree>...]
|
||||
[ [--exclude-standard] [--cached | --no-index | --untracked] | <tree>...]
|
||||
[--] [<pathspec>...]
|
||||
|
||||
DESCRIPTION
|
||||
|
@ -49,7 +49,20 @@ OPTIONS
|
|||
blobs registered in the index file.
|
||||
|
||||
--no-index::
|
||||
Search files in the current directory, not just those tracked by git.
|
||||
Search files in the current directory that is not managed by git.
|
||||
|
||||
--untracked::
|
||||
In addition to searching in the tracked files in the working
|
||||
tree, search also in untracked files.
|
||||
|
||||
--no-exclude-standard::
|
||||
Also search in ignored files by not honoring the `.gitignore`
|
||||
mechanism. Only useful with `--untracked`.
|
||||
|
||||
--exclude-standard::
|
||||
Do not pay attention to ignored files specified via the `.gitignore`
|
||||
mechanism. Only useful when searching files in the current directory
|
||||
with `--no-index`.
|
||||
|
||||
-a::
|
||||
--text::
|
||||
|
|
|
@ -640,12 +640,15 @@ static int grep_objects(struct grep_opt *opt, const struct pathspec *pathspec,
|
|||
return hit;
|
||||
}
|
||||
|
||||
static int grep_directory(struct grep_opt *opt, const struct pathspec *pathspec)
|
||||
static int grep_directory(struct grep_opt *opt, const struct pathspec *pathspec,
|
||||
int exc_std)
|
||||
{
|
||||
struct dir_struct dir;
|
||||
int i, hit = 0;
|
||||
|
||||
memset(&dir, 0, sizeof(dir));
|
||||
if (exc_std)
|
||||
setup_standard_excludes(&dir);
|
||||
|
||||
fill_directory(&dir, pathspec->raw);
|
||||
for (i = 0; i < dir.nr; i++) {
|
||||
|
@ -752,7 +755,7 @@ static int help_callback(const struct option *opt, const char *arg, int unset)
|
|||
int cmd_grep(int argc, const char **argv, const char *prefix)
|
||||
{
|
||||
int hit = 0;
|
||||
int cached = 0;
|
||||
int cached = 0, untracked = 0, opt_exclude = -1;
|
||||
int seen_dashdash = 0;
|
||||
int external_grep_allowed__ignored;
|
||||
const char *show_in_pager = NULL, *default_pager = "dummy";
|
||||
|
@ -779,6 +782,10 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
|
|||
{ OPTION_BOOLEAN, 0, "index", &use_index, NULL,
|
||||
"finds in contents not managed by git",
|
||||
PARSE_OPT_NOARG | PARSE_OPT_NEGHELP },
|
||||
OPT_BOOLEAN(0, "untracked", &untracked,
|
||||
"search in both tracked and untracked files"),
|
||||
OPT_SET_INT(0, "exclude-standard", &opt_exclude,
|
||||
"search also in ignored files", 1),
|
||||
OPT_GROUP(""),
|
||||
OPT_BOOLEAN('v', "invert-match", &opt.invert,
|
||||
"show non-matching lines"),
|
||||
|
@ -1048,13 +1055,16 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
|
|||
if (!show_in_pager)
|
||||
setup_pager();
|
||||
|
||||
if (!use_index && (untracked || cached))
|
||||
die(_("--cached or --untracked cannot be used with --no-index."));
|
||||
|
||||
if (!use_index) {
|
||||
if (cached)
|
||||
die(_("--cached cannot be used with --no-index."));
|
||||
if (!use_index || untracked) {
|
||||
int use_exclude = (opt_exclude < 0) ? use_index : !!opt_exclude;
|
||||
if (list.nr)
|
||||
die(_("--no-index cannot be used with revs."));
|
||||
hit = grep_directory(&opt, &pathspec);
|
||||
die(_("--no-index or --untracked cannot be used with revs."));
|
||||
hit = grep_directory(&opt, &pathspec, use_exclude);
|
||||
} else if (0 <= opt_exclude) {
|
||||
die(_("--exclude or --no-exclude cannot be used for tracked contents."));
|
||||
} else if (!list.nr) {
|
||||
if (!cached)
|
||||
setup_work_tree();
|
||||
|
|
|
@ -570,6 +570,23 @@ test_expect_success 'outside of git repository' '
|
|||
test_must_fail git grep o &&
|
||||
git grep --no-index o >../../actual.sub &&
|
||||
test_cmp ../../expect.sub ../../actual.sub
|
||||
) &&
|
||||
|
||||
echo ".*o*" >non/git/.gitignore &&
|
||||
(
|
||||
GIT_CEILING_DIRECTORIES="$(pwd)/non/git" &&
|
||||
export GIT_CEILING_DIRECTORIES &&
|
||||
cd non/git &&
|
||||
test_must_fail git grep o &&
|
||||
git grep --no-index --exclude-standard o >../actual.full &&
|
||||
test_cmp ../expect.full ../actual.full &&
|
||||
|
||||
{
|
||||
echo ".gitignore:.*o*"
|
||||
cat ../expect.full
|
||||
} >../expect.with.ignored &&
|
||||
git grep --no-index --no-exclude o >../actual.full &&
|
||||
test_cmp ../expect.with.ignored ../actual.full
|
||||
)
|
||||
'
|
||||
|
||||
|
@ -580,9 +597,12 @@ test_expect_success 'inside git repository but with --no-index' '
|
|||
echo world >is/git/sub/file2 &&
|
||||
echo ".*o*" >is/git/.gitignore &&
|
||||
{
|
||||
echo ".gitignore:.*o*" &&
|
||||
echo file1:hello &&
|
||||
echo sub/file2:world
|
||||
} >is/expect.unignored &&
|
||||
{
|
||||
echo ".gitignore:.*o*" &&
|
||||
cat is/expect.unignored
|
||||
} >is/expect.full &&
|
||||
: >is/expect.empty &&
|
||||
echo file2:world >is/expect.sub &&
|
||||
|
@ -591,12 +611,24 @@ test_expect_success 'inside git repository but with --no-index' '
|
|||
git init &&
|
||||
test_must_fail git grep o >../actual.full &&
|
||||
test_cmp ../expect.empty ../actual.full &&
|
||||
|
||||
git grep --untracked o >../actual.unignored &&
|
||||
test_cmp ../expect.unignored ../actual.unignored &&
|
||||
|
||||
git grep --no-index o >../actual.full &&
|
||||
test_cmp ../expect.full ../actual.full &&
|
||||
|
||||
git grep --no-index --exclude-standard o >../actual.unignored &&
|
||||
test_cmp ../expect.unignored ../actual.unignored &&
|
||||
|
||||
cd sub &&
|
||||
test_must_fail git grep o >../../actual.sub &&
|
||||
test_cmp ../../expect.empty ../../actual.sub &&
|
||||
|
||||
git grep --no-index o >../../actual.sub &&
|
||||
test_cmp ../../expect.sub ../../actual.sub &&
|
||||
|
||||
git grep --untracked o >../../actual.sub &&
|
||||
test_cmp ../../expect.sub ../../actual.sub
|
||||
)
|
||||
'
|
||||
|
|
Loading…
Reference in a new issue