From: Eric Sunshine <sunshine@sunshineco.com>
To: Jeff King <peff@peff.net>
Cc: Git List <git@vger.kernel.org>
Subject: Re: [PATCH] fsck: avoid looking at NULL blob->object
Date: Sat, 9 Jun 2018 04:38:54 -0400 [thread overview]
Message-ID: <CAPig+cTgCD5=96XG=Z5FwOsPbN409DxzAfPy0p=wnoLywu++dw@mail.gmail.com> (raw)
In-Reply-To: <20180609083159.GA6158@sigill.intra.peff.net>
On Sat, Jun 9, 2018 at 4:32 AM, Jeff King <peff@peff.net> wrote:
> Commit 159e7b080b (fsck: detect gitmodules files,
> 2018-05-02) taught fsck to look at the content of
> .gitmodules files. If the object turns out not to be a blob
> at all, we just complain and punt on checking the content.
> And since this was such an obvious and trivial code path, I
> didn't even bother to add a test.
> [...]
> Signed-off-by: Jeff King <peff@peff.net>
> ---
> diff --git a/t/t7415-submodule-names.sh b/t/t7415-submodule-names.sh
> @@ -151,4 +151,22 @@ test_expect_success 'fsck detects symlinked .gitmodules file' '
> +test_expect_success 'fsck detects non-blob .gitmodules' '
> + git init non-blob &&
> + (
> + cd non-blob &&
> +
> + # As above, make the funny directly to avoid index restrictions.
Is there a word missing after "funny"?
> + mkdir subdir &&
> + cp ../.gitmodules subdir/file &&
> + git add subdir/file &&
> + git commit -m ok &&
> + tree=$(git ls-tree HEAD | sed s/subdir/.gitmodules/ | git mktree) &&
> + commit=$(git commit-tree $tree) &&
I see that this is just mirroring the preceding test, but do you need
to assign to variable 'commit' which is never consulted by anything
later in the test?
> + test_must_fail git fsck 2>output &&
> + grep gitmodulesBlob output
> + )
> +'
next prev parent reply other threads:[~2018-06-09 8:38 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 [this message]
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 ` [PATCH v3 1/2] t7415: don't bother creating commit for symlink test Jeff King
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='CAPig+cTgCD5=96XG=Z5FwOsPbN409DxzAfPy0p=wnoLywu++dw@mail.gmail.com' \
--to=sunshine@sunshineco.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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).