[WIP PATCH 12/26] grep: move up gitdir setup to run_builtin()
From: Nguyễn Thái Ngọc Duy <hidden>
Date: 2016-06-15 22:48:17
Subsystem:
the rest · Maintainer:
Linus Torvalds
grep has USE_PAGER set. setup_pager() may read config even setup_git_dir* is not run yet. When the config path is required, setup_git_env() plays hero and set gitdir to ".git". Shortly after, setup_git_dir* is run inside cmd_shortlog() and may move gitdir to somewhere else. Signed-off-by: Nguyễn Thái Ngọc Duy <redacted> --- builtin-grep.c | 9 +++------ git.c | 2 +- t/t7002-grep.sh | 2 ++ 3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/builtin-grep.c b/builtin-grep.c
index 46ffc1d..84c05e0 100644
--- a/builtin-grep.c
+++ b/builtin-grep.c@@ -758,7 +758,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix) const char **paths = NULL; int i; int dummy; - int nongit = 0, use_index = 1; + int use_index = 1; struct option options[] = { OPT_BOOLEAN(0, "cached", &cached, "search in index instead of in the work tree"),
@@ -846,8 +846,6 @@ int cmd_grep(int argc, const char **argv, const char *prefix) OPT_END() }; - prefix = setup_git_directory_gently(&nongit); - /* * 'git grep -h', unlike 'git grep -h <pattern>', is a request * to show usage information and exit.
@@ -885,9 +883,8 @@ int cmd_grep(int argc, const char **argv, const char *prefix) PARSE_OPT_STOP_AT_NON_OPTION | PARSE_OPT_NO_INTERNAL_HELP); - if (use_index && nongit) - /* die the same way as if we did it at the beginning */ - setup_git_directory(); + if (use_index && !startup_info->have_repository) + die("No git repository found"); /* * skip a -- separator; we know it cannot be
diff --git a/git.c b/git.c
index c7af80e..3462b49 100644
--- a/git.c
+++ b/git.c@@ -339,7 +339,7 @@ static void handle_internal_command(int argc, const char **argv) { "fsck-objects", cmd_fsck, RUN_SETUP }, { "gc", cmd_gc, RUN_SETUP }, { "get-tar-commit-id", cmd_get_tar_commit_id }, - { "grep", cmd_grep, USE_PAGER }, + { "grep", cmd_grep, RUN_SETUP_GENTLY | USE_PAGER }, { "hash-object", cmd_hash_object, RUN_SETUP_GENTLY }, { "help", cmd_help }, { "index-pack", cmd_index_pack },
diff --git a/t/t7002-grep.sh b/t/t7002-grep.sh
index ebae152..67afb42 100755
--- a/t/t7002-grep.sh
+++ b/t/t7002-grep.sh@@ -8,6 +8,8 @@ test_description='git grep various. . ./test-lib.sh +export GIT_HARDENED_SETUP=1 + cat >hello.c <<EOF #include <stdio.h> int main(int argc, const char **argv)
--
1.7.0.195.g637a2