[PATCH] subdirectory tests: code cleanup, uncomment test
- From
Stefan Beller <sbeller@google.com>
- Date
- May 18, 2015, 21:10 UTC
- Message-ID
- <1431983426-4346-1-git-send-email-sbeller@google.com>
- In-Reply-To
- <xmqqlhglbt4k.fsf@gitster.dls.corp.google.com>
Originally the test in t1020 was meant to not include setting the GIT_DIR when testing inside a bare repository as it did not work without setting GIT_DIR explicitly.
Nowadays the test as originally intended works, so add it to the test suite. We'll keep the test, which has been run through all years as another test for finding regressions.
Signed-off-by: Stefan Beller <sbeller@google.com> ---
Junio, thanks for providing the context!
I tried tracking down when this changes via bisect, though I messed up. By looking through the code I find these commits most promising to have fixed the underlying issue (I am no expert on subdirectory treatment) 337e51c (Use git_config_early() instead of git_config() during repo setup, 2010-11-26) 72183cb (Fix gitdir detection when in subdir of gitdir, 2009-01-16) 9951d3b (setup: clean up setup_discovered_git_dir(), 2010-11-26)
t/t1020-subdirectory.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/t/t1020-subdirectory.sh b/t/t1020-subdirectory.sh index 2edb4f2..022641d 100755 --- a/t/t1020-subdirectory.sh +++ b/t/t1020-subdirectory.sh @@ -162,16 +162,20 @@ test_expect_success 'no file/rev ambiguity check inside .git' ' ) ' -test_expect_success 'no file/rev ambiguity check inside a bare repo' ' +test_expect_success '(historic) no file/rev ambiguity check inside a bare repo' ' + test_when_finished "rm -fr foo.git" && git clone -s --bare .git foo.git && ( cd foo.git && + # older Git needed help by exporting GIT_DIR=. + # to realize that it is inside a bare repository. + # We keep this test around for regression testing. GIT_DIR=. git show -s HEAD ) ' -# This still does not work as it should... -: test_expect_success 'no file/rev ambiguity check inside a bare repo' ' +test_expect_success 'no file/rev ambiguity check inside a bare repo' ' + test_when_finished "rm -fr foo.git" && git clone -s --bare .git foo.git && ( cd foo.git && @@ -180,7 +184,6 @@ test_expect_success 'no file/rev ambiguity check inside a bare repo' ' ' test_expect_success SYMLINKS 'detection should not be fooled by a symlink' ' - rm -fr foo.git && git clone -s .git another && ln -s another yetanother && (
-- 2.4.0.194.gc518059