From: Jeff King <peff@peff.net>
To: "SZEDER Gábor" <szeder.dev@gmail.com>
Cc: git@vger.kernel.org
Subject: [PATCH v3 1/2] t7415: don't bother creating commit for symlink test
Date: Mon, 11 Jun 2018 04:35:40 -0400 [thread overview]
Message-ID: <20180611083540.GA16131@sigill.intra.peff.net> (raw)
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
next prev parent reply other threads:[~2018-06-11 8:35 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-09 8:32 [PATCH] fsck: avoid looking at NULL blob->object Jeff King
2018-06-09 8:38 ` Eric Sunshine
2018-06-09 9:19 ` Jeff King
2018-06-09 8:45 ` Duy Nguyen
2018-06-09 9:20 ` Jeff King
2018-06-09 8:50 ` Martin Ågren
2018-06-09 9:21 ` Jeff King
2018-06-09 13:44 ` Martin Ågren
2018-06-12 9:51 ` Jeff King
2018-06-09 9:30 ` [PATCH v2 0/2] .gitmodules fsck cleanups Jeff King
2018-06-09 9:31 ` [PATCH v2 1/2] t7415: don't bother creating commit for symlink test Jeff King
2018-06-09 9:46 ` SZEDER Gábor
2018-06-11 8:35 ` [PATCH v3 0/2] .gitmodules fsck cleanups Jeff King
2018-06-11 8:35 ` Jeff King [this message]
2018-06-11 8:35 ` [PATCH v3 2/2] fsck: avoid looking at NULL blob->object Jeff King
2018-06-09 9:31 ` [PATCH v2 " Jeff King
2018-06-09 9:50 ` SZEDER Gábor
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180611083540.GA16131@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=szeder.dev@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).