From: Stefan Beller <sbeller@google.com>
To: Antonio Ospite <ao2@ao2.it>
Cc: git <git@vger.kernel.org>, "Brandon Williams" <bmwill@google.com>,
"Daniel Graña" <dangra@gmail.com>,
"Jonathan Nieder" <jrnieder@gmail.com>,
"Richard Hartmann" <richih.mailinglist@gmail.com>
Subject: Re: [RFC PATCH 01/10] config: make config_from_gitmodules generally useful
Date: Thu, 21 Jun 2018 11:53:07 -0700 [thread overview]
Message-ID: <CAGZ79kaxMiPEaCTCjgwHjc8uQ58eCTquYiDN5WM9Vs7j9FTMSQ@mail.gmail.com> (raw)
In-Reply-To: <20180621155438.31b244a9d5d7b4723f85ba89@ao2.it>
> OK, the fact I was overlooking was that the "config_fn_t" argument
> passed to config_from_gitmodules is what we are actually worried about,
> it's the config callback which could allow generic config in .gitmodules
> to sneak in.
That is the precise point that I was trying to communicate. :)
>
> So, from Brandon's message I derive that using the gitmodules_cb from
> submodules-config.c as a callback would be safe, as that's what
> repo_read_gitmodules already uses anyways, and it only allows submodules
> configuration.
I agree.
>
> However, what about avoiding exposing the dangerous interface altogether
> and adding ad-hoc helpers when needed?
>
> I mean:
>
> 0. Move config_from_gitmodules to submodule-config.c as per Bradon's
> suggestion.
That sounds good to me.
> 1. Add public helpers in submodule-config.[ch] to handle backwards
> compatibility, like: fetch_config_from_gitmodules() and
> update_clone_config_from_gitmodules() these would be used by fetch
> and update-clone function and would not accept callbacks.
>
> This would mean moving the callback functions
> gitmodules_fetch_config() and gitmodules_update_clone_config() into
> submodule-config.c and making them private. The helpers will call
> config_from_gitmodules() with them.
>
> 2. Now that config_from_gitmodules it's not used in the open it can be
> made private too, so it can only be used in submodule-config.c
>
> 3. Use config_from_gitmodules in repo_read_gitmodules as the
> gitmodules_cb function should be safe to use as a config callback.
That sounds all good to me.
>
> 4. Add a new gitmodules_get_value() helper in submodule-config.c which
> calls config_from_gitmodules with a "print" callback and use that
> helper for "submodule--helper config",
>
> 5. At this point we shouldn't worry too much about the .gitmodules
> content anymore, and we can possibly extend config_from_gitmodules
> to read from other locations like HEAD:.gitmodules.
These two would actually align with your goal of the original series. :)
>
> This way the number of users of config_from_gitmodules remains strictly
> controlled and confined in submodule-config.c
>
> I know, we could end up adding more code with the helpers but that could
> be justified by the more protective approach: we would be using symbols
> scoping rules instead of comments to ensure something.
>
> If you think this may be worth a shot I can send a series which covers
> items from 0 to 3.
That would be great!
Thanks,
Stefan
>
> Ciao,
> Antonio
>
> P.S. Always relevant: https://youtu.be/8fnfeuoh4s8 (I swear it's not
> Rick Astley)
heh!
next prev parent reply other threads:[~2018-06-21 18:53 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-14 10:58 [RFC PATCH 00/10] Make submodules work if .gitmodules is not checked out Antonio Ospite
2018-05-14 10:58 ` [RFC PATCH 01/10] config: make config_from_gitmodules generally useful Antonio Ospite
2018-05-14 18:19 ` Brandon Williams
2018-06-20 18:04 ` Antonio Ospite
2018-05-15 1:05 ` Stefan Beller
2018-06-20 18:06 ` Antonio Ospite
2018-06-20 19:10 ` Stefan Beller
2018-06-21 13:54 ` Antonio Ospite
2018-06-21 18:53 ` Stefan Beller [this message]
2018-05-14 10:58 ` [RFC PATCH 02/10] submodule: factor out a config_gitmodules_set function Antonio Ospite
2018-05-15 1:20 ` Stefan Beller
2018-06-20 18:41 ` Antonio Ospite
2018-05-14 10:58 ` [RFC PATCH 03/10] t7411: be nicer to other tests and really clean things up Antonio Ospite
2018-05-15 1:23 ` Stefan Beller
2018-06-20 21:16 ` Antonio Ospite
2018-05-14 10:58 ` [RFC PATCH 04/10] submodule--helper: add a new 'config' subcommand Antonio Ospite
2018-05-15 1:33 ` Stefan Beller
2018-06-20 21:32 ` Antonio Ospite
2018-05-14 10:58 ` [RFC PATCH 05/10] submodule: use the 'submodule--helper config' command Antonio Ospite
2018-05-14 10:58 ` [RFC PATCH 06/10] submodule--helper: add a '--stage' option to the 'config' sub command Antonio Ospite
2018-05-14 10:58 ` [RFC PATCH 07/10] submodule: use 'submodule--helper config --stage' to stage .gitmodules Antonio Ospite
2018-05-14 10:58 ` [RFC PATCH 08/10] t7506: cleanup .gitmodules properly before setting up new scenario Antonio Ospite
2018-05-14 10:58 ` [RFC PATCH 09/10] submodule: support reading .gitmodules even when it's not checked out Antonio Ospite
2018-05-15 1:45 ` Stefan Beller
2018-05-14 10:58 ` [RFC PATCH 10/10] t7415: add new test about using HEAD:.gitmodules from the index Antonio Ospite
2018-05-15 1:14 ` [RFC PATCH 00/10] Make submodules work if .gitmodules is not checked out Stefan Beller
2018-05-15 4:09 ` 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=CAGZ79kaxMiPEaCTCjgwHjc8uQ58eCTquYiDN5WM9Vs7j9FTMSQ@mail.gmail.com \
--to=sbeller@google.com \
--cc=ao2@ao2.it \
--cc=bmwill@google.com \
--cc=dangra@gmail.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=richih.mailinglist@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).