From: Junio C Hamano <gitster@pobox.com>
To: "Glen Choo via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Glen Choo <chooglen@google.com>
Subject: Re: [PATCH 0/2] [2.38 regression] config: respect includes in protected config
Date: Wed, 12 Oct 2022 13:54:06 -0700 [thread overview]
Message-ID: <xmqqmta0kbkh.fsf@gitster.g> (raw)
In-Reply-To: <pull.1360.git.git.1665603814.gitgitgadget@gmail.com> (Glen Choo via GitGitGadget's message of "Wed, 12 Oct 2022 19:43:32 +0000")
"Glen Choo via GitGitGadget" <gitgitgadget@gmail.com> writes:
> Here's a fix for the regression reported in [1]. I'm quite confident that
> the test suite is extensive enough to catch any unintended behavioral
> changes, but I'd appreciate a second opinion.
This hooks onto safe.directory that dates back to 2.30.4 or so, but
the topic gc/bare-repo-discovery appears only in 2.38 so we do not
have to backport anything beyond the current maintenance track.
Whew ;-)
> Cc: Derrick Stolee derrickstolee@github.com, Taylor Blau me@ttaylorr.com,
> Johannes Schindelin Johannes.Schindelin@gmx.de, Junio C Hamano
> gitster@pobox.com
>
> [1]
> https://lore.kernel.org/git/CAPWNY8W_Tr-WoD-GXBddD5Y8w5Y4w+gDNYQdOAJ1uBwVHuRrsQ@mail.gmail.com
>
> Glen Choo (2):
> t0033, t0035: test for included config
> config: respect includes in protected config
>
> config.c | 30 ++++++++----------------------
> t/t0033-safe-directory.sh | 9 +++++++++
> t/t0035-safe-bare-repository.sh | 9 +++++++++
> 3 files changed, 26 insertions(+), 22 deletions(-)
>
>
> base-commit: 3dcec76d9df911ed8321007b1d197c1a206dc164
> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1360%2Fchooglen%2Fprotected-config%2Frespect-includes-v1
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1360/chooglen/protected-config/respect-includes-v1
> Pull-Request: https://github.com/git/git/pull/1360
next prev parent reply other threads:[~2022-10-12 20:54 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-12 19:43 [PATCH 0/2] [2.38 regression] config: respect includes in protected config Glen Choo via GitGitGadget
2022-10-12 19:43 ` [PATCH 1/2] t0033, t0035: test for included config Glen Choo via GitGitGadget
2022-10-12 22:28 ` Ævar Arnfjörð Bjarmason
2022-10-12 19:43 ` [PATCH 2/2] config: respect includes in protected config Glen Choo via GitGitGadget
2022-10-12 20:48 ` Junio C Hamano
2022-10-12 22:09 ` Glen Choo
2022-10-12 21:07 ` Junio C Hamano
2022-10-12 19:47 ` [PATCH 0/2] [2.38 regression] " Glen Choo
2022-10-12 20:54 ` Junio C Hamano [this message]
2022-10-13 17:43 ` [PATCH v2] " Glen Choo via GitGitGadget
2022-10-13 18:21 ` Glen Choo
2022-10-14 20:14 ` Jeff King
2022-10-18 14:36 ` Johannes Schindelin
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqmta0kbkh.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=chooglen@google.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.