Add new configuration option grep.includeUntracked that enables --untracked
option by default. This pretty much follows the logic established by the
already existing configuration option grep.fallbackToNoIndex, while also
respecting the dependencies of the --untracked option.
Also add a few automated tests to the t7810, to cover the new configuration
option by replicating the already existing tests for --untracked.
Signed-off-by: Dragan Simic <dsimic@xxxxxxxxxxx>
---
builtin/grep.c | 3 +++
t/t7810-grep.sh | 9 +++++++++
2 files changed, 12 insertions(+)
diff --git a/builtin/grep.c b/builtin/grep.c
index af89c8b5cb19..71d94126fb6e 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -1041,6 +1041,9 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
the_repository->settings.command_requires_full_index = 0;
}
+ if (use_index && !cached)
+ git_config_get_bool("grep.includeuntracked", &untracked);
+
if (use_index && !startup_info->have_repository) {
int fallback = 0;
git_config_get_bool("grep.fallbacktonoindex", &fallback);
diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh
index 875dcfd98f3a..de93936d585f 100755
--- a/t/t7810-grep.sh
+++ b/t/t7810-grep.sh
@@ -1298,20 +1298,29 @@ test_expect_success 'inside git repository but with --no-index' '
git grep --untracked o >../actual.unignored &&
test_cmp ../expect.unignored ../actual.unignored &&
+ git -c grep.includeUntracked=true grep o >../actual.unignored &&
+ test_cmp ../expect.unignored ../actual.unignored &&
+
git grep --no-index o >../actual.full &&
test_cmp ../expect.full ../actual.full &&
+ git -c grep.includeUntracked=true 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_must_be_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 &&
+
+ git -c grep.includeUntracked=true grep o >../../actual.sub &&
test_cmp ../../expect.sub ../../actual.sub
)
'
