diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-02-05 09:20:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-02-05 09:27:25 -0800 |
| commit | 3c8f6c8c4f00414e66076c2c97c834d01f828491 (patch) | |
| tree | 983851e2396d04bfb3f640fe3ab07d8d8bfd2dd3 /t | |
| parent | 8bff7c5383ed833bd1df9c8d85c00a27af3e5b02 (diff) | |
| download | git-3c8f6c8c4f00414e66076c2c97c834d01f828491.tar.gz git-3c8f6c8c4f00414e66076c2c97c834d01f828491.tar.xz | |
Revert 30816237 and 7e62265
It seems that we have bad interaction with the code related to
GIT_WORK_TREE and "grep --no-index", and broke running grep inside
the .git directory. For now, just revert it and resurrect it after
1.7.0 ships.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7002-grep.sh | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/t/t7002-grep.sh b/t/t7002-grep.sh index bf4d4dcb2..7144f815c 100755 --- a/t/t7002-grep.sh +++ b/t/t7002-grep.sh @@ -434,56 +434,4 @@ test_expect_success 'grep -Fi' ' test_cmp expected actual ' -test_expect_success 'outside of git repository' ' - rm -fr non && - mkdir -p non/git/sub && - echo hello >non/git/file1 && - echo world >non/git/sub/file2 && - echo ".*o*" >non/git/.gitignore && - { - echo file1:hello && - echo sub/file2:world - } >non/expect.full && - echo file2:world >non/expect.sub - ( - GIT_CEILING_DIRECTORIES="$(pwd)/non/git" && - export GIT_CEILING_DIRECTORIES && - cd non/git && - test_must_fail git grep o && - git grep --no-index o >../actual.full && - test_cmp ../expect.full ../actual.full - cd sub && - test_must_fail git grep o && - git grep --no-index o >../../actual.sub && - test_cmp ../../expect.sub ../../actual.sub - ) -' - -test_expect_success 'inside git repository but with --no-index' ' - rm -fr is && - mkdir -p is/git/sub && - echo hello >is/git/file1 && - echo world >is/git/sub/file2 && - echo ".*o*" >is/git/.gitignore && - { - echo file1:hello && - echo sub/file2:world - } >is/expect.full && - : >is/expect.empty && - echo file2:world >is/expect.sub - ( - cd is/git && - git init && - test_must_fail git grep o >../actual.full && - test_cmp ../expect.empty ../actual.full && - git grep --no-index o >../actual.full && - test_cmp ../expect.full ../actual.full && - 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 - ) -' - test_done |