[PATCH v3 1/2] t7415: don't bother creating commit for symlink test
- From
Jeff King <peff@peff.net>
- Date
- Jun 11, 2018, 08:35 UTC
- Message-ID
- <20180611083540.GA16131@sigill.intra.peff.net>
- In-Reply-To
- <20180611083515.GA1815@sigill.intra.peff.net>
Early versions of the fsck .gitmodules detection code actually required a tree to be at the root of a commit for it to be checked for .gitmodules. What we ended up with in 159e7b080b (fsck: detect gitmodules files, 2018-05-02), though, finds a .gitmodules file in _any_ tree (see that commit for more discussion).
As a result, there's no need to create a commit in our tests. Let's drop it in the name of simplicity. And since that was the only thing referencing $tree, we can pull our tree creation out of a command substitution.
Signed-off-by: Jeff King <peff@peff.net> --- t/t7415-submodule-names.sh | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/t/t7415-submodule-names.sh b/t/t7415-submodule-names.sh index a770d92a55..541bd81684 100755 --- a/t/t7415-submodule-names.sh +++ b/t/t7415-submodule-names.sh @@ -135,13 +135,10 @@ test_expect_success 'fsck detects symlinked .gitmodules file' ' tricky="[foo]bar=true" && content=$(git hash-object -w ../.gitmodules) && target=$(printf "$tricky" | git hash-object -w --stdin) && - tree=$( - { - printf "100644 blob $content\t$tricky\n" && - printf "120000 blob $target\t.gitmodules\n" - } | git mktree - ) && - commit=$(git commit-tree $tree) && + { + printf "100644 blob $content\t$tricky\n" && + printf "120000 blob $target\t.gitmodules\n" + } | git mktree && # Check not only that we fail, but that it is due to the # symlink detector; this grep string comes from the config
-- 2.18.0.rc1.446.g4486251e51