[PATCH 05/12] grep: run setup_git_directory_gently() sooner
- From
Jonathan Nieder <jrnieder@gmail.com>
- Date
- Aug 6, 2010, 03:06 UTC
- Message-ID
- <20100806030637.GI22369@burratino>
- In-Reply-To
- <20100806023529.GB22369@burratino>
From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
git grep already runs a repository search unconditionally, even when the --no-index option is supplied; running such a search earlier is not very risky.
Just like with shortlog, without this change, the “[pager] grep” configuration is not respected at all.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> --- Aside from rewriting the commit message and adding tests, this drops the interesting
- /* die the same way as if we did it at the beginning */
- setup_git_directory();
+ die("No git repository found");hunk. That change might be a good idea but it does not fit the theme of this chapter.
builtin/grep.c | 6 ++---- git.c | 2 +- t/t7006-pager.sh | 13 +++++++++++++ 3 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/builtin/grep.c b/builtin/grep.c index d0a73da..cd44926 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -791,7 +791,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"), @@ -879,8 +879,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. @@ -925,7 +923,7 @@ 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) + if (use_index && !startup_info->have_repository) /* die the same way as if we did it at the beginning */ setup_git_directory(); diff --git a/git.c b/git.c index b821058..0240179 100644 --- a/git.c +++ b/git.c @@ -336,7 +336,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 }, { "help", cmd_help }, { "index-pack", cmd_index_pack }, diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh index 084dfdb..fd7f77b 100755 --- a/t/t7006-pager.sh +++ b/t/t7006-pager.sh @@ -105,6 +105,19 @@ test_expect_success TTY 'no pager with --no-pager' ' ! test -e paginated.out ' +test_expect_success TTY 'configuration can disable pager' ' + rm -f paginated.out && + test_might_fail git config --unset pager.grep && + test_terminal git grep initial && + test -e paginated.out && + + rm -f paginated.out && + git config pager.grep false && + test_when_finished "git config --unset pager.grep" && + test_terminal git grep initial && + ! test -e paginated.out +' + # A colored commit log will begin with an appropriate ANSI escape # for the first color; the text "commit" comes later. colorful() {
-- 1.7.2.1.544.ga752d.dirty