mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
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>
This commit is contained in:
parent
a2558fb8e1
commit
1f5101aee2
|
@ -791,12 +791,12 @@ test_expect_success 'outside of git repository' '
|
|||
} >non/expect.full &&
|
||||
echo file2:world >non/expect.sub &&
|
||||
(
|
||||
GIT_CEILING_DIRECTORIES="$(pwd)/non/git" &&
|
||||
GIT_CEILING_DIRECTORIES="$(pwd)/non" &&
|
||||
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
|
||||
test_cmp ../expect.full ../actual.full &&
|
||||
cd sub &&
|
||||
test_must_fail git grep o &&
|
||||
git grep --no-index o >../../actual.sub &&
|
||||
|
@ -805,7 +805,7 @@ test_expect_success 'outside of git repository' '
|
|||
|
||||
echo ".*o*" >non/git/.gitignore &&
|
||||
(
|
||||
GIT_CEILING_DIRECTORIES="$(pwd)/non/git" &&
|
||||
GIT_CEILING_DIRECTORIES="$(pwd)/non" &&
|
||||
export GIT_CEILING_DIRECTORIES &&
|
||||
cd non/git &&
|
||||
test_must_fail git grep o &&
|
||||
|
@ -813,7 +813,7 @@ test_expect_success 'outside of git repository' '
|
|||
test_cmp ../expect.full ../actual.full &&
|
||||
|
||||
{
|
||||
echo ".gitignore:.*o*"
|
||||
echo ".gitignore:.*o*" &&
|
||||
cat ../expect.full
|
||||
} >../expect.with.ignored &&
|
||||
git grep --no-index --no-exclude o >../actual.full &&
|
||||
|
|
Loading…
Reference in a new issue