Skip to content

Commit 1f5101a

Browse files
tgummerergitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent a2558fb commit 1f5101a

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

t/t7810-grep.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -791,12 +791,12 @@ test_expect_success 'outside of git repository' '
791791
} >non/expect.full &&
792792
echo file2:world >non/expect.sub &&
793793
(
794-
GIT_CEILING_DIRECTORIES="$(pwd)/non/git" &&
794+
GIT_CEILING_DIRECTORIES="$(pwd)/non" &&
795795
export GIT_CEILING_DIRECTORIES &&
796796
cd non/git &&
797797
test_must_fail git grep o &&
798798
git grep --no-index o >../actual.full &&
799-
test_cmp ../expect.full ../actual.full
799+
test_cmp ../expect.full ../actual.full &&
800800
cd sub &&
801801
test_must_fail git grep o &&
802802
git grep --no-index o >../../actual.sub &&
@@ -805,15 +805,15 @@ test_expect_success 'outside of git repository' '
805805
806806
echo ".*o*" >non/git/.gitignore &&
807807
(
808-
GIT_CEILING_DIRECTORIES="$(pwd)/non/git" &&
808+
GIT_CEILING_DIRECTORIES="$(pwd)/non" &&
809809
export GIT_CEILING_DIRECTORIES &&
810810
cd non/git &&
811811
test_must_fail git grep o &&
812812
git grep --no-index --exclude-standard o >../actual.full &&
813813
test_cmp ../expect.full ../actual.full &&
814814
815815
{
816-
echo ".gitignore:.*o*"
816+
echo ".gitignore:.*o*" &&
817817
cat ../expect.full
818818
} >../expect.with.ignored &&
819819
git grep --no-index --no-exclude o >../actual.full &&

0 commit comments

Comments
 (0)