From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Ramsay Jones <ramsay@ramsayjones.plus.com>,
Jason@zx2c4.com, GIT Mailing-list <git@vger.kernel.org>
Subject: Re: [PATCH 2/2] fsck: downgrade gitmodulesParse default to "info"
Date: Mon, 16 Jul 2018 11:04:04 -0700 [thread overview]
Message-ID: <xmqqwotvt5uz.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20180713193958.GB12162@sigill.intra.peff.net> (Jeff King's message of "Fri, 13 Jul 2018 15:39:58 -0400")
Jeff King <peff@peff.net> writes:
> site's support). And the broken .gitmodules may be too
> far back in history for rewriting to be feasible (again,
> this is an issue for cgit).
"again" but this is the first mention that hints cgit has some
problem (but not exactly what problem). Is that the "cgit has a
file called .gitmodules that predates the submodule support on our
side?" thing?
> So we're being unnecessarily restrictive without actually
> improving the security in a meaningful way. It would be more
> convenient to downgrade this check to "info", which means
> we'd still comment on it, but not reject a push. Site admins
> can already do this via config, but we should ship sensible
> defaults.
> ...
> Considering both sets of arguments, it makes sense to loosen
> this check for now.
>
> Note that we have to tweak the test in t7415 since fsck will
> no longer consider this a fatal error. But we still check
> that it reports the warning, and that we don't get the
> spurious error from the config code.
>
> Signed-off-by: Jeff King <peff@peff.net>
> ---
Thanks.
> fsck.c | 2 +-
> t/t7415-submodule-names.sh | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fsck.c b/fsck.c
> index 4129935d86..69ea8d5321 100644
> --- a/fsck.c
> +++ b/fsck.c
> @@ -62,7 +62,6 @@ static struct oidset gitmodules_done = OIDSET_INIT;
> FUNC(ZERO_PADDED_DATE, ERROR) \
> FUNC(GITMODULES_MISSING, ERROR) \
> FUNC(GITMODULES_BLOB, ERROR) \
> - FUNC(GITMODULES_PARSE, ERROR) \
> FUNC(GITMODULES_LARGE, ERROR) \
> FUNC(GITMODULES_NAME, ERROR) \
> FUNC(GITMODULES_SYMLINK, ERROR) \
> @@ -77,6 +76,7 @@ static struct oidset gitmodules_done = OIDSET_INIT;
> FUNC(ZERO_PADDED_FILEMODE, WARN) \
> FUNC(NUL_IN_COMMIT, WARN) \
> /* infos (reported as warnings, but ignored by default) */ \
> + FUNC(GITMODULES_PARSE, INFO) \
> FUNC(BAD_TAG_NAME, INFO) \
> FUNC(MISSING_TAGGER_ENTRY, INFO)
>
> diff --git a/t/t7415-submodule-names.sh b/t/t7415-submodule-names.sh
> index ba8af785a5..293e2e1963 100755
> --- a/t/t7415-submodule-names.sh
> +++ b/t/t7415-submodule-names.sh
> @@ -185,7 +185,7 @@ test_expect_success 'fsck detects corrupt .gitmodules' '
> git add .gitmodules &&
> git commit -m "broken gitmodules" &&
>
> - test_must_fail git fsck 2>output &&
> + git fsck 2>output &&
> grep gitmodulesParse output &&
> test_i18ngrep ! "bad config" output
> )
next prev parent reply other threads:[~2018-07-16 18:04 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-27 18:39 [PATCH] fsck: check skiplist for object in fsck_blob() Ramsay Jones
2018-06-28 11:49 ` Jeff King
2018-06-28 16:39 ` Junio C Hamano
2018-06-28 17:30 ` Jeff King
2018-06-28 16:56 ` Ramsay Jones
2018-06-28 17:28 ` Junio C Hamano
2018-06-28 17:45 ` Jeff King
2018-06-28 18:53 ` Ramsay Jones
2018-06-28 22:03 ` Jeff King
2018-06-28 22:05 ` [PATCH 1/4] config: turn die_on_error into caller-facing enum Jeff King
2018-06-28 22:05 ` [PATCH 2/4] config: add CONFIG_ERROR_SILENT handler Jeff King
2018-06-28 22:05 ` [PATCH 3/4] config: add options parameter to git_config_from_mem Jeff King
2018-06-28 22:06 ` [PATCH 4/4] fsck: silence stderr when parsing .gitmodules Jeff King
2018-06-28 22:12 ` Jeff King
2018-06-29 1:14 ` Ramsay Jones
2018-06-29 1:10 ` [PATCH] fsck: check skiplist for object in fsck_blob() Ramsay Jones
2018-07-03 14:34 ` Jeff King
2018-07-04 0:12 ` Ramsay Jones
2018-07-07 1:32 ` Jeff King
2018-07-11 19:31 ` Ramsay Jones
2018-07-13 19:37 ` Ramsay Jones
2018-07-13 19:41 ` Jeff King
2018-07-13 19:46 ` Jeff King
2018-07-13 20:08 ` Ramsay Jones
2018-07-13 19:38 ` Jeff King
2018-07-13 19:39 ` [PATCH 1/2] fsck: split ".gitmodules too large" error from parse failure Jeff King
2018-07-13 19:39 ` [PATCH 2/2] fsck: downgrade gitmodulesParse default to "info" Jeff King
2018-07-13 20:21 ` Stefan Beller
2018-07-16 18:04 ` Junio C Hamano [this message]
2018-07-16 18:30 ` Jeff King
2018-07-16 21:08 ` Junio C Hamano
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=xmqqwotvt5uz.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=Jason@zx2c4.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=ramsay@ramsayjones.plus.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).