@matheusbsbs / matheus-bagliano / commits / 1f5101aee2

t7810: correct --no-index test

GIT_CEILING_DIRECTORIES doesn't prevent chdir up into another directory while looking for a repository directory if it is equal to the current directory. Because of this, the test which claims to test the git grep --no-index command outside of a repository actually tests it inside of a repository. The test_must_fail assertions still pass because the git grep only looks at untracked files and therefore no file matches, but not because it's run outside of a repository as it was originally intended. Set the GIT_CEILING_DIRECTORIES environment variable to the parent directory of the directory in which the git grep command is executed, to make sure it is actually run outside of a git repository. In addition, the && chain was broken in a couple of places in the same test, fix that. Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Thomas Gummerer committed Jan 11, 2016 at 22:26 UTC 1f5101aee2daa3459cf50f945da924afa78a8ced

1 file changed +4 -4

t/t7810-grep.sh

+4 -4

@@ -791,12 +791,12 @@ test_expect_success 'outside of git repository' '

791 } >non/expect.full &&

792 echo file2:world >non/expect.sub &&

793 (

794 - GIT_CEILING_DIRECTORIES="$(pwd)/non/git" &&

794 + GIT_CEILING_DIRECTORIES="$(pwd)/non" &&

795 export GIT_CEILING_DIRECTORIES &&

796 cd non/git &&

797 test_must_fail git grep o &&

798 git grep --no-index o >../actual.full &&

799 - test_cmp ../expect.full ../actual.full

799 + test_cmp ../expect.full ../actual.full &&

800 cd sub &&

801 test_must_fail git grep o &&

802 git grep --no-index o >../../actual.sub &&

@@ -805,7 +805,7 @@ test_expect_success 'outside of git repository' '

805

806 echo ".*o*" >non/git/.gitignore &&

807 (

808 - GIT_CEILING_DIRECTORIES="$(pwd)/non/git" &&

808 + GIT_CEILING_DIRECTORIES="$(pwd)/non" &&

809 export GIT_CEILING_DIRECTORIES &&

810 cd non/git &&

811 test_must_fail git grep o &&

@@ -813,7 +813,7 @@ test_expect_success 'outside of git repository' '

813 test_cmp ../expect.full ../actual.full &&

814

815 {

816 - echo ".gitignore:.*o*"

816 + echo ".gitignore:.*o*" &&

817 cat ../expect.full

818 } >../expect.with.ignored &&

819 git grep --no-index --no-exclude o >../actual.full &&