[PATCH 1/3] t7810: correct --no-index test
- From
Thomas Gummerer <t.gummerer@gmail.com>
- Date
- Jan 10, 2016, 14:19 UTC
- Message-ID
- <1452435597-12099-2-git-send-email-t.gummerer@gmail.com>
- In-Reply-To
- <1452435597-12099-1-git-send-email-t.gummerer@gmail.com>
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.
Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> ---
t/t7810-grep.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh index 028ffe4..ab94716 100755 --- a/t/t7810-grep.sh +++ b/t/t7810-grep.sh @@ -791,7 +791,7 @@ 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 && @@ -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 &&
-- 2.6.3.387.g749a69c.dirty